Merge branch 'stable-2.6'

[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 208460d..5d53118 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."""
@@ -48,16 +49,17 @@ class MapperTests(unittest.TestCase):
   def testMapper(self):
     """Testing Mapper"""
 
-    self._TestUri("/tags", (rlib1.R_tags, [], {}))
-    self._TestUri("/instances", (rlib2.R_instances, [], {}))
+    self._TestFailingUri("/tags")
+    self._TestFailingUri("/instances")
+    self._TestUri("/version", (rlib2.R_version, [], {}))
 
-    self._TestUri('/instances/www.test.com',
-                  (rlib1.R_instances_name,
+    self._TestUri('/2/instances/www.test.com',
+                  (rlib2.R_2_instances_name,
                    ['www.test.com'],
                    {}))
 
-    self._TestUri('/instances/www.test.com/tags?f=5&f=6&alt=html',
-                  (rlib1.R_instances_name_tags,
+    self._TestUri('/2/instances/www.test.com/tags?f=5&f=6&alt=html',
+                  (rlib2.R_2_instances_name_tags,
                    ['www.test.com'],
                    {'alt': ['html'],
                     'f': ['5', '6'],
@@ -67,23 +69,5 @@ class MapperTests(unittest.TestCase):
     self._TestFailingUri("/instances/does/not/exist")
 
 
-class R_RootTests(unittest.TestCase):
-  """Testing for R_root class."""
-
-  def setUp(self):
-    self.root = connector.R_root(None, None, None)
-
-  def testGet(self):
-    expected = [
-      {'name': 'info', 'uri': '/info'},
-      {'name': 'instances', 'uri': '/instances'},
-      {'name': 'nodes', 'uri': '/nodes'},
-      {'name': 'os', 'uri': '/os'},
-      {'name': 'tags', 'uri': '/tags'},
-      {'name': 'version', 'uri': '/version'},
-      ]
-    self.assertEquals(self.root.GET(), expected)
-
-
 if __name__ == '__main__':
-  unittest.main()
+  testutils.GanetiTestProgram()