diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-08 19:40:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-08 19:40:01 +0000 |
| commit | 00c81514adf228d33f5e9aafcedef1c121151efe (patch) | |
| tree | 8ce6aca618276af0038ba2ea7657cc15be2ddf9e | |
| parent | b42839be64c19896924208105317336a465dd8c1 (diff) | |
| parent | b1c4315fce34e8664bbf3cb969312afe5e56f114 (diff) | |
Merge "tests.integrated fails with devstack"
| -rw-r--r-- | nova/tests/integrated/integrated_helpers.py | 3 |
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' |