diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-01 20:31:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-01 20:31:57 +0000 |
| commit | f41f14f1e92ec9722d96f2f699dde060cd3980a3 (patch) | |
| tree | 516c684221b76025773c7d27f536abc0b9b55fbf | |
| parent | 7b664b14f02b8b0c7008e294ea6309d6afa8aed7 (diff) | |
| parent | ec2dbf02ddf223d06495c6e2264b0c142e599604 (diff) | |
| download | nova-f41f14f1e92ec9722d96f2f699dde060cd3980a3.tar.gz nova-f41f14f1e92ec9722d96f2f699dde060cd3980a3.tar.xz nova-f41f14f1e92ec9722d96f2f699dde060cd3980a3.zip | |
Merge "Fix test_launcher_app to ensure service actually got started"
| -rw-r--r-- | nova/tests/test_service.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py index 0fd79f42a..fbc3e57a1 100644 --- a/nova/tests/test_service.py +++ b/nova/tests/test_service.py @@ -22,6 +22,8 @@ Unit Tests for remote procedure calls using queue import mox +from eventlet import greenthread + from nova import context from nova import db from nova import exception @@ -217,5 +219,7 @@ class TestLauncher(test.TestCase): self.assertEquals(0, self.service.port) launcher = service.Launcher() launcher.launch_server(self.service) - self.assertEquals(0, self.service.port) + # Give spawned thread a chance to execute + greenthread.sleep(0) + self.assertNotEquals(0, self.service.port) launcher.stop() |