summaryrefslogtreecommitdiffstats
path: root/nova/tests/integrated
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-03 19:21:22 +0000
committerGerrit Code Review <review@openstack.org>2013-06-03 19:21:22 +0000
commitf1d88658972f9ab79ecf3f78a40c1d3529115253 (patch)
treeb5ebae29f59946d82f8d1111698a8537e3df82fa /nova/tests/integrated
parent0afcc051a99443004510458da32e507385d58873 (diff)
parent2b92ca1de7ad10d2777ac44b95da55467cca7a21 (diff)
downloadnova-f1d88658972f9ab79ecf3f78a40c1d3529115253.tar.gz
nova-f1d88658972f9ab79ecf3f78a40c1d3529115253.tar.xz
nova-f1d88658972f9ab79ecf3f78a40c1d3529115253.zip
Merge "Moved sample network creation out of unittest base class constructor."
Diffstat (limited to 'nova/tests/integrated')
-rw-r--r--nova/tests/integrated/test_api_samples.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 873719ab6..cfd1877f5 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -93,6 +93,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
ext = [self.extension_name] if self.extension_name else []
self.flags(osapi_compute_extension=ext + extends)
super(ApiSampleTestBase, self).setUp()
+ self.useFixture(test.SampleNetworks())
fake_network.stub_compute_with_ips(self.stubs)
self.generate_samples = os.getenv('GENERATE_SAMPLES') is not None