From 6bfaeb954f0f0c96f73d91890a50448443ac9133 Mon Sep 17 00:00:00 2001 From: Soren Hansen Date: Fri, 15 Oct 2010 21:49:31 +0200 Subject: [PATCH] Add a greenthread.sleep(0.3) in get_console_output unit test. This is needed because, for eventlet based unit tests, rpc polls, and there's a bit of a race. We need to fix this properly later on. --- nova/tests/cloud_unittest.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index ff466135..36ab6029 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -26,6 +26,7 @@ import StringIO import tempfile import time +from eventlet import greenthread from twisted.internet import defer import unittest from xml.etree import ElementTree @@ -101,6 +102,9 @@ class CloudTestCase(test.TrialTestCase): instance_id = rv['instancesSet'][0]['instanceId'] output = yield self.cloud.get_console_output(context=self.context, instance_id=[instance_id]) self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE OUTPUT') + # TODO(soren): We need this until we can stop polling in the rpc code + # for unit tests. + greenthread.sleep(0.3) rv = yield self.cloud.terminate_instances(self.context, [instance_id])