projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import-export daemon: Allow changing compression method
[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
1385eab
..
70f68b5
100755
(executable)
--- a/
test/ganeti.rapi.resources_unittest.py
+++ b/
test/ganeti.rapi.resources_unittest.py
@@
-28,9
+28,10
@@
import tempfile
from ganeti import errors
from ganeti import http
from ganeti import errors
from ganeti import http
-from ganeti.rapi import connector
-from ganeti.rapi import RESTHTTPServer
-from ganeti.rapi import rlib1
+from ganeti.rapi import connector
+from ganeti.rapi import rlib2
+
+import testutils
class MapperTests(unittest.TestCase):
class MapperTests(unittest.TestCase):
@@
-43,21
+44,22
@@
class MapperTests(unittest.TestCase):
self.assertEquals(self.map.getController(uri), result)
def _TestFailingUri(self, uri):
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"""
def testMapper(self):
"""Testing Mapper"""
- self._TestUri("/tags", (rlib1.R_tags, [], {}))
- self._TestUri("/instances", (rlib1.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'],
{}))
['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'],
['www.test.com'],
{'alt': ['html'],
'f': ['5', '6'],
@@
-75,15
+77,11
@@
class R_RootTests(unittest.TestCase):
def testGet(self):
expected = [
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': '2', 'uri': '/2'},
{'name': 'version', 'uri': '/version'},
]
self.assertEquals(self.root.GET(), expected)
if __name__ == '__main__':
{'name': 'version', 'uri': '/version'},
]
self.assertEquals(self.root.GET(), expected)
if __name__ == '__main__':
- unittest.main()
+ testutils.GanetiTestProgram()