summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorRyu Ishimoto <ryu@midokura.jp>2011-07-23 05:11:39 +0900
committerRyu Ishimoto <ryu@midokura.jp>2011-07-23 05:11:39 +0900
commit348dcb39f879926c20ed87256b149aeeaa4c6832 (patch)
tree4f2a484670b82faea7c555e68eba3f0fd725a98d /nova/tests
parentd06908783c9a20621af124d824a88d34b6d78b33 (diff)
Add i18n for logging, changed create_bridge/vlan to should_create_bridge/vlan, changed unfilter_instance's keyword param to positional, and added Dan's alternate ID to .mailmap
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_compute.py2
-rw-r--r--nova/tests/test_network.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index b80813220..2a8f33dd3 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -828,7 +828,7 @@ class ComputeTestCase(test.TestCase):
for v in i_ref['volumes']:
self.compute.volume_manager.remove_compute_volume(c, v['id'])
self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
- self.compute.driver.unfilter_instance(i_ref, network_info=[])
+ self.compute.driver.unfilter_instance(i_ref, [])
# executing
self.mox.ReplayAll()
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index fca2975de..39695a1b1 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -164,8 +164,8 @@ class FlatNetworkTestCase(test.TestCase):
'label': 'test%s' % i,
'mac': 'DE:AD:BE:EF:00:0%s' % i,
'rxtx_cap': 'DONTCARE',
- 'create_vlan': False,
- 'create_bridge': False}
+ 'should_create_vlan': False,
+ 'should_create_bridge': False}
self.assertDictMatch(nw[1], check)
check = [{'enabled': 'DONTCARE',