summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhongyue Luo <lzyeval@gmail.com>2012-02-08 08:26:52 -0500
committerZhongyue Luo <lzyeval@gmail.com>2012-02-08 08:26:52 -0500
commitb1c4315fce34e8664bbf3cb969312afe5e56f114 (patch)
tree8ac0ee00f92c73f6bb52f29ed0cf3dfbfc0337d2
parent27ac9d5f0ca4279753ee2984769094f2b4191619 (diff)
tests.integrated fails with devstack
Fixes bug #928836 Change-Id: Ib703d2fce73b668b5872ea75f8ab4fd1cfd1960a
-rw-r--r--nova/tests/integrated/integrated_helpers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/integrated/integrated_helpers.py b/nova/tests/integrated/integrated_helpers.py
index 6cacb8da8..b4e104b1a 100644
--- a/nova/tests/integrated/integrated_helpers.py
+++ b/nova/tests/integrated/integrated_helpers.py
@@ -96,7 +96,8 @@ class _IntegratedTestBase(test.TestCase):
# Auto-assign ports to allow concurrent tests
f['ec2_listen_port'] = 0
- f['osapi_listen_port'] = 0
+ f['osapi_compute_listen_port'] = 0
+ f['osapi_volume_listen_port'] = 0
f['metadata_listen_port'] = 0
f['image_service'] = 'nova.image.fake.FakeImageService'