diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-07 18:13:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-07 18:13:48 +0000 |
| commit | 0b28e574afa8563524e21d31d95972c8ba126de2 (patch) | |
| tree | f093132f890b76bb500898f6a3d3102e849fe26d /nova/tests | |
| parent | 0c78c2ed61c84ff967c2e6894f5dcff0987c2dec (diff) | |
| parent | f845891184b17e2c31a2b02dbc9217978abd3242 (diff) | |
Merge "First steps towards consolidating testing infrastructure"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_iptables_network.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/tests/test_iptables_network.py b/nova/tests/test_iptables_network.py index 918034269..478dfa70d 100644 --- a/nova/tests/test_iptables_network.py +++ b/nova/tests/test_iptables_network.py @@ -84,12 +84,12 @@ class IptablesManagerTestCase(test.TestCase): table = self.manager.ipv4['filter'] table.add_rule('FORWARD', '-s 1.2.3.4/5 -j DROP') new_lines = self.manager._modify_rules(current_lines, table) - self.assertTrue('-A run_tests.py-FORWARD ' + self.assertTrue('-A runner.py-FORWARD ' '-s 1.2.3.4/5 -j DROP' in new_lines) table.remove_rule('FORWARD', '-s 1.2.3.4/5 -j DROP') new_lines = self.manager._modify_rules(current_lines, table) - self.assertTrue('-A run_tests.py-FORWARD ' + self.assertTrue('-A runner.py-FORWARD ' '-s 1.2.3.4/5 -j DROP' not in new_lines) def test_nat_rules(self): @@ -123,7 +123,7 @@ class IptablesManagerTestCase(test.TestCase): "nova-postouting-bottom: %s" % last_postrouting_line) for chain in ['POSTROUTING', 'PREROUTING', 'OUTPUT']: - self.assertTrue('-A %s -j run_tests.py-%s' \ + self.assertTrue('-A %s -j runner.py-%s' \ % (chain, chain) in new_lines, "Built-in chain %s not wrapped" % (chain,)) @@ -155,10 +155,10 @@ class IptablesManagerTestCase(test.TestCase): break self.assertTrue('-A nova-filter-top ' - '-j run_tests.py-local' in new_lines, + '-j runner.py-local' in new_lines, "nova-filter-top does not jump to wrapped local chain") for chain in ['INPUT', 'OUTPUT', 'FORWARD']: - self.assertTrue('-A %s -j run_tests.py-%s' \ + self.assertTrue('-A %s -j runner.py-%s' \ % (chain, chain) in new_lines, "Built-in chain %s not wrapped" % (chain,)) |