summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-07 18:55:34 +0000
committerGerrit Code Review <review@openstack.org>2012-06-07 18:55:34 +0000
commit089300fd4bcecaacd2ea3fa345a1b6b2c5b2ab61 (patch)
tree7b0a479a21f587762b6ca6814f3c68de9da61c75 /nova/tests
parent7bf79a132b1826bc29b1c15ebfc7356c14f42515 (diff)
parentfe5706cb973e1cddecdeed9580fc9d9bbdc848fd (diff)
Merge "Convert consoles to use instance uuid."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/console/test_console.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/console/test_console.py b/nova/tests/console/test_console.py
index 626cf2206..986ffeb2e 100644
--- a/nova/tests/console/test_console.py
+++ b/nova/tests/console/test_console.py
@@ -95,8 +95,8 @@ class ConsoleTestCase(test.TestCase):
instance['host'], self.console.host,
self.console.driver.console_type)
- console_instances = [con['instance_id'] for con in pool.consoles]
- self.assert_(instance_id in console_instances)
+ console_instances = [con['instance_uuid'] for con in pool.consoles]
+ self.assert_(instance['uuid'] in console_instances)
db.instance_destroy(self.context, instance_id)
def test_add_console_does_not_duplicate(self):