summaryrefslogtreecommitdiff
path: root/test/units/modules/test_iptables.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/units/modules/test_iptables.py')
-rw-r--r--test/units/modules/test_iptables.py40
1 files changed, 9 insertions, 31 deletions
diff --git a/test/units/modules/test_iptables.py b/test/units/modules/test_iptables.py
index 265e770a..2459cf77 100644
--- a/test/units/modules/test_iptables.py
+++ b/test/units/modules/test_iptables.py
@@ -181,7 +181,7 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 2)
+ self.assertEqual(run_command.call_count, 1)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t',
@@ -208,7 +208,6 @@ class TestIptables(ModuleTestCase):
commands_results = [
(1, '', ''), # check_rule_present
- (0, '', ''), # check_chain_present
(0, '', ''),
]
@@ -218,7 +217,7 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 3)
+ self.assertEqual(run_command.call_count, 2)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t',
@@ -232,7 +231,7 @@ class TestIptables(ModuleTestCase):
'-j',
'ACCEPT'
])
- self.assertEqual(run_command.call_args_list[2][0][0], [
+ self.assertEqual(run_command.call_args_list[1][0][0], [
'/sbin/iptables',
'-t',
'filter',
@@ -272,7 +271,7 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 2)
+ self.assertEqual(run_command.call_count, 1)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t',
@@ -321,7 +320,7 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 3)
+ self.assertEqual(run_command.call_count, 2)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t',
@@ -343,7 +342,7 @@ class TestIptables(ModuleTestCase):
'--to-ports',
'8600'
])
- self.assertEqual(run_command.call_args_list[2][0][0], [
+ self.assertEqual(run_command.call_args_list[1][0][0], [
'/sbin/iptables',
'-t',
'nat',
@@ -1019,10 +1018,8 @@ class TestIptables(ModuleTestCase):
})
commands_results = [
- (1, '', ''), # check_rule_present
(1, '', ''), # check_chain_present
(0, '', ''), # create_chain
- (0, '', ''), # append_rule
]
with patch.object(basic.AnsibleModule, 'run_command') as run_command:
@@ -1031,32 +1028,20 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 4)
+ self.assertEqual(run_command.call_count, 2)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t', 'filter',
- '-C', 'FOOBAR',
- ])
-
- self.assertEqual(run_command.call_args_list[1][0][0], [
- '/sbin/iptables',
- '-t', 'filter',
'-L', 'FOOBAR',
])
- self.assertEqual(run_command.call_args_list[2][0][0], [
+ self.assertEqual(run_command.call_args_list[1][0][0], [
'/sbin/iptables',
'-t', 'filter',
'-N', 'FOOBAR',
])
- self.assertEqual(run_command.call_args_list[3][0][0], [
- '/sbin/iptables',
- '-t', 'filter',
- '-A', 'FOOBAR',
- ])
-
commands_results = [
(0, '', ''), # check_rule_present
]
@@ -1078,7 +1063,6 @@ class TestIptables(ModuleTestCase):
commands_results = [
(1, '', ''), # check_rule_present
- (1, '', ''), # check_chain_present
]
with patch.object(basic.AnsibleModule, 'run_command') as run_command:
@@ -1087,17 +1071,11 @@ class TestIptables(ModuleTestCase):
iptables.main()
self.assertTrue(result.exception.args[0]['changed'])
- self.assertEqual(run_command.call_count, 2)
+ self.assertEqual(run_command.call_count, 1)
self.assertEqual(run_command.call_args_list[0][0][0], [
'/sbin/iptables',
'-t', 'filter',
- '-C', 'FOOBAR',
- ])
-
- self.assertEqual(run_command.call_args_list[1][0][0], [
- '/sbin/iptables',
- '-t', 'filter',
'-L', 'FOOBAR',
])