x/python-ganttclient
Code Issues Proposed changes

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.

Browse Source
This commit is contained in:
Soren Hansen
2010-10-15 21:49:31 +02:00
parent a4a2bfd0bf
commit 6bfaeb954f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/cloud_unittest.py
View File

@@ -26,6 +26,7 @@ import StringIO
import tempfile import tempfile
import time import time
from eventlet import greenthread
from twisted.internet import defer from twisted.internet import defer
import unittest import unittest
from xml.etree import ElementTree from xml.etree import ElementTree
@@ -101,6 +102,9 @@ class CloudTestCase(test.TrialTestCase):
instance_id = rv['instancesSet'][0]['instanceId'] instance_id = rv['instancesSet'][0]['instanceId']
output = yield self.cloud.get_console_output(context=self.context, instance_id=[instance_id]) output = yield self.cloud.get_console_output(context=self.context, instance_id=[instance_id])
self.assertEquals(b64decode(output['output']), 'FAKE CONSOLE OUTPUT') 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]) rv = yield self.cloud.terminate_instances(self.context, [instance_id])