summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2012-09-13 12:06:09 -0700
committerDan Smith <danms@us.ibm.com>2012-09-13 13:53:48 -0700
commit423dbafd08ac3bb970bcb842fa6e7812d42ceb4e (patch)
tree69cd3ee95a3ca0ea7006e27478ac42e13e3cbab7 /nova/tests
parent9d791c1225d4923a8e25060490b931c669e4424d (diff)
Make compute/manager.py use self.host instead of FLAGS.host
This prevents the instances returned from getting a different instance['host'] than was supplied to the manager. This shows up during integrated testing of 'resize'. Change-Id: Ifa4316bf7099dc2c60c4e87cfaafa93a4bc2e5b1
Diffstat (limited to 'nova/tests')
-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 ca49a560a..4766ed034 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1595,7 +1595,7 @@ class ComputeTestCase(BaseTestCase):
self.compute.run_instance(self.context, instance=instance)
new_instance = db.instance_update(self.context, instance['uuid'],
- {'host': 'foo'})
+ {'host': self.compute.host})
new_instance = jsonutils.to_primitive(new_instance)
instance_type = instance_types.get_default_instance_type()