libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [26/46] libcloud git commit: fix cloudstack tests
Date Thu, 13 Apr 2017 09:33:32 GMT
fix cloudstack tests


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/d8da3fe6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/d8da3fe6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/d8da3fe6

Branch: refs/heads/trunk
Commit: d8da3fe6838582e3c639a23b0785a59a6a3f35e9
Parents: 0c114fb
Author: Anthony Shaw <anthonyshaw@apache.org>
Authored: Wed Apr 12 14:49:29 2017 +1000
Committer: Anthony Shaw <anthonyshaw@apache.org>
Committed: Wed Apr 12 14:49:29 2017 +1000

----------------------------------------------------------------------
 libcloud/test/compute/test_cloudstack.py | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/d8da3fe6/libcloud/test/compute/test_cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_cloudstack.py b/libcloud/test/compute/test_cloudstack.py
index df675ae..8e620bb 100644
--- a/libcloud/test/compute/test_cloudstack.py
+++ b/libcloud/test/compute/test_cloudstack.py
@@ -254,7 +254,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertEqual(0, len(images))
 
     def test_list_images(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listTemplates_default.json')
         templates = fixture['listtemplatesresponse']['template']
 
@@ -278,7 +278,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertEqual(10, diskOffering.size)
 
     def test_ex_list_networks(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listNetworks_default.json')
         fixture_networks = fixture['listnetworksresponse']['network']
 
@@ -295,7 +295,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
             self.assertEqual(network.zoneid, fixture_networks[i]['zoneid'])
 
     def test_ex_list_network_offerings(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listNetworkOfferings_default.json')
         fixture_networkoffers = \
             fixture['listnetworkofferingsresponse']['networkoffering']
@@ -316,7 +316,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
                              fixture_networkoffers[i]['serviceofferingid'])
 
     def test_ex_create_network(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'createNetwork_default.json')
 
         fixture_network = fixture['createnetworkresponse']['network']
@@ -352,7 +352,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertTrue(result)
 
     def test_ex_list_nics(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listNics_default.json')
 
         fixture_nic = fixture['listnicsresponse']['nic']
@@ -392,7 +392,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertTrue(result)
 
     def test_ex_list_vpc_offerings(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listVPCOfferings_default.json')
         fixture_vpcoffers = \
             fixture['listvpcofferingsresponse']['vpcoffering']
@@ -407,7 +407,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
                              fixture_vpcoffers[i]['displaytext'])
 
     def test_ex_list_vpcs(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listVPCs_default.json')
         fixture_vpcs = fixture['listvpcsresponse']['vpc']
 
@@ -422,7 +422,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
             self.assertEqual(vpc.zone_id, fixture_vpcs[i]['zoneid'])
 
     def test_ex_list_routers(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listRouters_default.json')
         fixture_routers = fixture['listroutersresponse']['router']
 
@@ -436,7 +436,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
             self.assertEqual(router.vpc_id, fixture_routers[i]['vpcid'])
 
     def test_ex_create_vpc(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'createVPC_default.json')
 
         fixture_vpc = fixture['createvpcresponse']
@@ -458,7 +458,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertTrue(result)
 
     def test_ex_create_network_acllist(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'createNetworkACLList_default.json')
 
         fixture_network_acllist = fixture['createnetworkacllistresponse']
@@ -472,7 +472,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertEqual(network_acllist.id, fixture_network_acllist['id'])
 
     def test_ex_list_network_acllist(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listNetworkACLLists_default.json')
         fixture_acllist = \
             fixture['listnetworkacllistsresponse']['networkacllist']
@@ -488,7 +488,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
                              fixture_acllist[i]['description'])
 
     def test_ex_create_network_acl(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'createNetworkACL_default.json')
 
         fixture_network_acllist = fixture['createnetworkaclresponse']
@@ -505,7 +505,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
         self.assertEqual(network_acl.id, fixture_network_acllist['id'])
 
     def test_ex_list_projects(self):
-        _, fixture = CloudStackMockHttp()._load_fixture(
+        _, fixture = self.driver.connection.connection._load_fixture(
             'listProjects_default.json')
         fixture_projects = fixture['listprojectsresponse']['project']
 
@@ -640,7 +640,7 @@ class CloudStackCommonTestCase(TestCaseMixin):
             self.assertEqual('1', kwargs.get('zoneid'))
 
             body, obj = self._load_fixture('listVirtualMachines_default.json')
-            return (httplib.OK, body, obj, httplib.responses[httplib.OK])
+            return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
         CloudStackMockHttp._cmd_listVirtualMachines = list_nodes_mock
         try:


Mime
View raw message