Merge pull request #40 from MartinPaulo/issue_39

The tests expect block storage to be available in all zones #39

test/helpers.py

@@ -118,14 +118,14 @@ def delete_test_network(network):
 
 
 def create_test_instance(
-        provider, instance_name, subnet, zone=None, launch_config=None,
+        provider, instance_name, subnet, launch_config=None,
         key_pair=None, security_groups=None):
     return provider.compute.instances.create(
         instance_name,
         get_provider_test_data(provider, 'image'),
         get_provider_test_data(provider, 'instance_type'),
         subnet=subnet,
-        zone=zone,
+        zone=get_provider_test_data(provider, 'placement'),
         key_pair=key_pair,
         security_groups=security_groups,
         launch_config=launch_config)

test/test_compute_service.py

@@ -319,8 +319,6 @@ class CloudComputeServiceTestCase(ProviderTestBase):
                         self.provider,
                         name,
                         subnet=subnet,
-                        zone=helpers.get_provider_test_data(self.provider,
-                                                            'placement'),
                         launch_config=lc)
 
                     with helpers.cleanup_action(lambda: