summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-06-14 14:11:38 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-06-14 14:11:38 -0500
commit30be7f9158e6bdc82957c2b4f25d3228cdd340b3 (patch)
tree571f5c69a07bcd391d9b43e97a7b872206ff4231
parent3bb80daeaf23a1e3f4cea577d5e9e96da0a1e6cd (diff)
fixed scary diff from trunk that shouldnt have been there
-rw-r--r--nova/tests/test_host_filter.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_host_filter.py b/nova/tests/test_host_filter.py
index 2ec048497..b3b85a7ed 100644
--- a/nova/tests/test_host_filter.py
+++ b/nova/tests/test_host_filter.py
@@ -57,8 +57,8 @@ class HostFilterTestCase(test.TestCase):
'host_name-label': 'xs-%s' % multiplier}
def setUp(self):
- self.old_flag = FLAGS.default_host_filter_driver
- FLAGS.default_host_filter_driver = \
+ self.old_flag = FLAGS.default_host_filter
+ FLAGS.default_host_filter = \
'nova.scheduler.host_filter.AllHostsFilter'
self.instance_type = dict(name='tiny',
memory_mb=50,
@@ -76,7 +76,7 @@ class HostFilterTestCase(test.TestCase):
self.zone_manager.service_states = states
def tearDown(self):
- FLAGS.default_host_filter_driver = self.old_flag
+ FLAGS.default_host_filter = self.old_flag
def test_choose_driver(self):
# Test default driver ...