Merge branch 'devel-2.1'

[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 9a5bef6..70f68b5 100755 (executable)
--- a/test/ganeti.rapi.resources_unittest.py
+++ b/test/ganeti.rapi.resources_unittest.py
@@ -29,9 +29,10 @@ from ganeti import errors
 from ganeti import http
 
 from ganeti.rapi import connector
-from ganeti.rapi import rlib1
 from ganeti.rapi import rlib2
 
+import testutils
+
 
 class MapperTests(unittest.TestCase):
   """Tests for remote API URI mapper."""
@@ -50,10 +51,10 @@ class MapperTests(unittest.TestCase):
 
     self._TestFailingUri("/tags")
     self._TestFailingUri("/instances")
-    self._TestUri("/version", (rlib1.R_version, [], {}))
+    self._TestUri("/version", (rlib2.R_version, [], {}))
 
     self._TestUri('/2/instances/www.test.com',
-                  (rlib1.R_instances_name,
+                  (rlib2.R_2_instances_name,
                    ['www.test.com'],
                    {}))
 
@@ -76,11 +77,11 @@ class R_RootTests(unittest.TestCase):
 
   def testGet(self):
     expected = [
-        # TODO: {'name': 'info', 'uri': '/2'},
+      {'name': '2', 'uri': '/2'},
       {'name': 'version', 'uri': '/version'},
       ]
     self.assertEquals(self.root.GET(), expected)
 
 
 if __name__ == '__main__':
-  unittest.main()
+  testutils.GanetiTestProgram()