Updated Branches: refs/heads/trunk 8c24cd627 -> 0d057251a
Fix the test case, make sure it tests the correct branch. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/530b2615 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/530b2615 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/530b2615 Branch: refs/heads/trunk Commit: 530b2615a450be8b56bba8c2f95d0a39a4638c54 Parents: 8c24cd6 Author: Tomaz Muraus <[email protected]> Authored: Wed Oct 2 21:05:50 2013 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Wed Oct 2 21:05:50 2013 +0100 ---------------------------------------------------------------------- libcloud/test/compute/test_openstack.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/530b2615/libcloud/test/compute/test_openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py index fe72c3e..30f78e3 100644 --- a/libcloud/test/compute/test_openstack.py +++ b/libcloud/test/compute/test_openstack.py @@ -912,7 +912,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(node.extra['key_name'], 'devstack') def test_create_node_with_ex_disk_config(self): - OpenStackMockHttp.type = 'EX_DISK_CONFIG' + OpenStack_1_1_MockHttp.type = 'EX_DISK_CONFIG' image = NodeImage(id=11, name='Ubuntu 8.10 (intrepid)', driver=self.driver) size = NodeSize(1, '256 slice', None, None, None, None, driver=self.driver) node = self.driver.create_node(name='racktest', image=image, size=size, @@ -1579,7 +1579,9 @@ class OpenStack_1_1_Auth_2_0_Tests(OpenStack_1_1_Tests): self.driver_klass.connectionCls.conn_classes = \ (OpenStack_2_0_MockHttp, OpenStack_2_0_MockHttp) self.driver_klass.connectionCls.auth_url = "https://auth.api.example.com/v2.0/"; + OpenStackMockHttp.type = None OpenStack_1_1_MockHttp.type = None + OpenStack_2_0_MockHttp.type = None self.driver = self.create_driver() # normally authentication happens lazily, but we force it here self.driver.connection._populate_hosts_and_request_paths()
