summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-19 16:52:50 +0000
committerGerrit Code Review <review@openstack.org>2012-01-19 16:52:50 +0000
commit02502f577481b77435f5cd15b253336205c90ba4 (patch)
tree0f2e91fd3d57bd40b85795d0cfff6f00320e2a9e /nova/tests
parent4b2035fa61b57052ca17e325e3783099a482f6ae (diff)
parent12470a324f70e8cb11b45e1f239f26b326b57f9c (diff)
Merge "Removed references to FLAGS.floating_ip_dns_domains."
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_network.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index f0decc233..573a308e1 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -1502,12 +1502,10 @@ class LdapDNSTestCase(test.TestCase):
self.driver.delete_domain(domain2)
def test_ldap_dns_domains(self):
- flags.FLAGS.floating_ip_dns_domains = [domain1, domain2]
-
domains = self.driver.get_domains()
self.assertEqual(len(domains), 2)
- self.assertEqual(domains[0], domain1)
- self.assertEqual(domains[1], domain2)
+ self.assertIn(domain1, domains)
+ self.assertIn(domain2, domains)
def test_ldap_dns_create_conflict(self):
address1 = "10.10.10.11"