summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-22 21:38:44 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-22 21:38:44 +0000
commitd0807b0e7290bcb1dfd7449470bc2def903272be (patch)
tree6aec6658eb298fbcc5acfa011c925ff44ea771ba /nova/tests
parent9e42bc18a12fe19ae333a3447d153bf3796d54d7 (diff)
parenteb64fe72160ca7c68809eaf0af91768f4eb5d8e8 (diff)
downloadnova-d0807b0e7290bcb1dfd7449470bc2def903272be.tar.gz
nova-d0807b0e7290bcb1dfd7449470bc2def903272be.tar.xz
nova-d0807b0e7290bcb1dfd7449470bc2def903272be.zip
merged trunk
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/virt_unittest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py
index dc13d6c54..9ad009510 100644
--- a/nova/tests/virt_unittest.py
+++ b/nova/tests/virt_unittest.py
@@ -339,7 +339,7 @@ class NWFilterTestCase(test.TestCase):
self.security_group.id)
instance = db.instance_get(self.context, inst_id)
- d = self.fw.setup_nwfilters_for_instance(instance)
+ self.fw.setup_base_nwfilters()
+ self.fw.setup_nwfilters_for_instance(instance)
_ensure_all_called()
self.teardown_security_group()
- return d