summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-04 12:31:23 +0000
committerGerrit Code Review <review@openstack.org>2013-01-04 12:31:23 +0000
commit668e8e943d112f7f67e228c43b6b24b544df3ced (patch)
tree18b84752627678e47f78df46cd2389510077b92f
parent89c2e6b71482db9ccd1d39bf0299b46c15477690 (diff)
parent2a94a257f95acf190091337600c1af5ae3c92142 (diff)
Merge "Fix error in test_get_all_by_multiple_options_at_once()"
-rw-r--r--nova/tests/compute/test_compute.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 01a4c4de7..d335f6675 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -4396,7 +4396,7 @@ class ComputeAPITestCase(BaseTestCase):
instance1 = self._create_fake_instance({
'display_name': 'woot',
- 'id': 0,
+ 'id': 1,
'uuid': '00000000-0000-0000-0000-000000000010'})
instance2 = self._create_fake_instance({
'display_name': 'woo',