summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-05-06 13:48:19 -0500
committerJosh Kearney <josh@jk0.org>2011-05-06 13:48:19 -0500
commitff036fb229e7ff1c73d6be395fbb3b2807b9eb53 (patch)
tree652d8dbcd7c2cae6404beb8ebad5a99cc97c40df /nova/tests
parent791f8dc895b97caa9395a52113823bde37ae6cfa (diff)
parent016be4ccdfe3f7791021bc717a1445b36cde371f (diff)
Merged trunk
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py
index c45bdd12c..f271c03f2 100644
--- a/nova/tests/test_cloud.py
+++ b/nova/tests/test_cloud.py
@@ -290,7 +290,7 @@ class CloudTestCase(test.TestCase):
instance_id = rv['instancesSet'][0]['instanceId']
output = 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)