burnin: move start_stop at the end

[ganeti-local] / test / ganeti.rapi.resources_unittest.py

diff --git a/test/ganeti.rapi.resources_unittest.py b/test/ganeti.rapi.resources_unittest.py
index c75cf17..208460d 100755 (executable)
--- a/test/ganeti.rapi.resources_unittest.py
+++ b/test/ganeti.rapi.resources_unittest.py
@@ -28,8 +28,9 @@ import tempfile
 from ganeti import errors
 from ganeti import http
 
-from ganeti.rapi import connector 
-from ganeti.rapi import rlib1 
+from ganeti.rapi import connector
+from ganeti.rapi import rlib1
+from ganeti.rapi import rlib2
 
 
 class MapperTests(unittest.TestCase):
@@ -42,13 +43,13 @@ class MapperTests(unittest.TestCase):
     self.assertEquals(self.map.getController(uri), result)
 
   def _TestFailingUri(self, uri):
-    self.failUnlessRaises(http.HTTPNotFound, self.map.getController, uri)
+    self.failUnlessRaises(http.HttpNotFound, self.map.getController, uri)
 
   def testMapper(self):
     """Testing Mapper"""
 
     self._TestUri("/tags", (rlib1.R_tags, [], {}))
-    self._TestUri("/instances", (rlib1.R_instances, [], {}))
+    self._TestUri("/instances", (rlib2.R_instances, [], {}))
 
     self._TestUri('/instances/www.test.com',
                   (rlib1.R_instances_name,
@@ -70,7 +71,7 @@ class R_RootTests(unittest.TestCase):
   """Testing for R_root class."""
 
   def setUp(self):
-    self.root = connector.R_root(None, None, None, None)
+    self.root = connector.R_root(None, None, None)
 
   def testGet(self):
     expected = [