summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-19 07:00:35 +0000
committerGerrit Code Review <review@openstack.org>2012-11-19 07:00:35 +0000
commit7d109ddcfd47babc52f4cfcc6ba1acf320654f1b (patch)
tree81ef3349224da5c0af6edf6a9e631188cd19e09c
parentf093d030f072b29e0dd137454a3c1cd7d8cf1b55 (diff)
parent19745d7cb1b30120469be1f34deda25b54a4b52f (diff)
downloadnova-7d109ddcfd47babc52f4cfcc6ba1acf320654f1b.tar.gz
nova-7d109ddcfd47babc52f4cfcc6ba1acf320654f1b.tar.xz
nova-7d109ddcfd47babc52f4cfcc6ba1acf320654f1b.zip
Merge "Set node_availability_zone in XenAPIAggregateTestCase"
-rw-r--r--nova/tests/test_xenapi.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 50ed9cd2a..276a9f071 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -2076,7 +2076,8 @@ class XenAPIAggregateTestCase(stubs.XenAPITestBase):
firewall_driver='nova.virt.xenapi.firewall.'
'Dom0IptablesFirewallDriver',
host='host',
- compute_driver='xenapi.XenAPIDriver')
+ compute_driver='xenapi.XenAPIDriver',
+ node_availability_zone='avail_zone1')
host_ref = xenapi_fake.get_all('host')[0]
stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
self.context = context.get_admin_context()