X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/fc72a3a3a20dd3fa6810f292bff0d8b5079a3c4b..7e3c1da638cf35da82bafc472fbc0ffe06423882:/test/ganeti.rapi.resources_unittest.py diff --git a/test/ganeti.rapi.resources_unittest.py b/test/ganeti.rapi.resources_unittest.py index b40e0da..70f68b5 100755 --- 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'], {})) @@ -83,4 +84,4 @@ class R_RootTests(unittest.TestCase): if __name__ == '__main__': - unittest.main() + testutils.GanetiTestProgram()