You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/10/12 11:46:55 UTC
[4/9] git commit: Less copy and pasting in Rackspace test cases.
Less copy and pasting in Rackspace test cases.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/92f32ff9
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/92f32ff9
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/92f32ff9
Branch: refs/heads/trunk
Commit: 92f32ff9454c5975dc04ca4a38099199badbfba2
Parents: 9d63631
Author: Tomaz Muraus <to...@apache.org>
Authored: Sat Oct 12 11:11:49 2013 +0200
Committer: Tomaz Muraus <to...@apache.org>
Committed: Sat Oct 12 11:11:49 2013 +0200
----------------------------------------------------------------------
libcloud/test/compute/test_rackspace.py | 58 +++++++++++-----------------
1 file changed, 22 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/92f32ff9/libcloud/test/compute/test_rackspace.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_rackspace.py b/libcloud/test/compute/test_rackspace.py
index 0eaadbc..546126e 100644
--- a/libcloud/test/compute/test_rackspace.py
+++ b/libcloud/test/compute/test_rackspace.py
@@ -119,7 +119,7 @@ class RackspaceNovaLonMockHttp(RackspaceNovaMockHttp):
httplib.responses[httplib.OK])
-class BaseRackspaceNovaTestCase(OpenStack_1_1_Tests):
+class BaseRackspaceNovaTestCase(object):
conn_classes = (RackspaceNovaMockHttp, RackspaceNovaMockHttp)
auth_url = 'https://auth.api.example.com/v2.0/'
@@ -137,52 +137,49 @@ class BaseRackspaceNovaTestCase(OpenStack_1_1_Tests):
clear_pricing_data()
self.node = self.driver.list_nodes()[1]
+ def test_service_catalog_contais_right_endpoint(self):
+ self.assertEqual(self.driver.connection.get_endpoint(),
+ self.expected_endpoint)
-class RackspaceNovaDfwTests(BaseRackspaceNovaTestCase):
+ def test_list_sizes_pricing(self):
+ sizes = self.driver.list_sizes()
+
+ for size in sizes:
+ if size.ram > 256:
+ self.assertTrue(size.price > 0)
+
+
+class RackspaceNovaDfwTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
driver_kwargs = {'region': 'dfw'}
- def test_service_catalog(self):
- self.assertEqual(
- 'https://dfw.servers.api.rackspacecloud.com/v2/1337',
- self.driver.connection.get_endpoint())
+ expected_endpoint = 'https://dfw.servers.api.rackspacecloud.com/v2/1337'
-class RackspaceNovaOrdTests(BaseRackspaceNovaTestCase):
+class RackspaceNovaOrdTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
driver_kwargs = {'region': 'ord'}
- def test_list_sizes_pricing(self):
- sizes = self.driver.list_sizes()
-
- for size in sizes:
- if size.ram > 256:
- self.assertTrue(size.price > 0)
+ expected_endpoint = 'https://ord.servers.api.rackspacecloud.com/v2/1337'
- def test_service_catalog(self):
- self.assertEqual('https://ord.servers.api.rackspacecloud.com/v2/1337',
- self.driver.connection.get_endpoint())
-
-class RackspaceNovaIadTests(BaseRackspaceNovaTestCase):
+class RackspaceNovaIadTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
driver_kwargs = {'region': 'iad'}
- def test_service_catalog(self):
- self.assertEqual('https://iad.servers.api.rackspacecloud.com/v2/1337',
- self.driver.connection.get_endpoint())
+ expected_endpoint = 'https://iad.servers.api.rackspacecloud.com/v2/1337'
-class RackspaceNovaLonTests(BaseRackspaceNovaTestCase):
+class RackspaceNovaLonTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
@@ -192,28 +189,17 @@ class RackspaceNovaLonTests(BaseRackspaceNovaTestCase):
conn_classes = (RackspaceNovaLonMockHttp, RackspaceNovaLonMockHttp)
auth_url = 'https://lon.auth.api.example.com/v2.0/'
- def test_list_sizes_pricing(self):
- sizes = self.driver.list_sizes()
-
- for size in sizes:
- if size.ram > 256:
- self.assertTrue(size.price > 0)
-
- def test_service_catalog(self):
- self.assertEqual('https://lon.servers.api.rackspacecloud.com/v2/1337',
- self.driver.connection.get_endpoint())
+ expected_endpoint = 'https://lon.servers.api.rackspacecloud.com/v2/1337'
-class RackspaceNovaSydTests(BaseRackspaceNovaTestCase):
+class RackspaceNovaSydTests(BaseRackspaceNovaTestCase, OpenStack_1_1_Tests):
driver_klass = RackspaceNodeDriver
driver_type = RackspaceNodeDriver
driver_args = RACKSPACE_NOVA_PARAMS
driver_kwargs = {'region': 'syd'}
- def test_service_catalog(self):
- self.assertEqual('https://syd.servers.api.rackspacecloud.com/v2/1337',
- self.driver.connection.get_endpoint())
+ expected_endpoint = 'https://syd.servers.api.rackspacecloud.com/v2/1337'
if __name__ == '__main__':
sys.exit(unittest.main())