diff options
| author | William Wolf <will.wolf@rackspace.com> | 2011-05-06 14:12:33 -0400 |
|---|---|---|
| committer | William Wolf <will.wolf@rackspace.com> | 2011-05-06 14:12:33 -0400 |
| commit | 500c14d8a879cb255e159acb69eda17de8f2b047 (patch) | |
| tree | 4ae0528e71c3213fb6f6df45ab6749dd2e299389 /nova/tests | |
| parent | 4a0142bdcd3d15c629ca96ba6d3d7fdaa13ed278 (diff) | |
| parent | 016be4ccdfe3f7791021bc717a1445b36cde371f (diff) | |
merge from trunk
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_cloud.py | 2 |
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) |