diff options
| author | vieira <vieira@yubo.be> | 2017-10-20 04:21:35 +0000 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2017-10-21 12:10:31 +1100 |
| commit | 7726dea27c71bda207ba28da6d1d9a84faae0749 (patch) | |
| tree | 984345d55a125f2037c17c20a6e1d548c4f4adee | |
| parent | 3635cc17adcea193fe3307e0a43530d6fe4f05ae (diff) | |
Test double restore (ipv4, ipv6) disables only once; test kldload
| -rw-r--r-- | sshuttle/tests/client/test_methods_pf.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sshuttle/tests/client/test_methods_pf.py b/sshuttle/tests/client/test_methods_pf.py index 637f347..2a26575 100644 --- a/sshuttle/tests/client/test_methods_pf.py +++ b/sshuttle/tests/client/test_methods_pf.py @@ -278,10 +278,12 @@ def test_setup_firewall_darwin(mock_pf_get_dev, mock_ioctl, mock_pfctl): @patch('sshuttle.helpers.verbose', new=3) @patch('sshuttle.methods.pf.pf', FreeBsd()) +@patch('subprocess.call') @patch('sshuttle.methods.pf.pfctl') @patch('sshuttle.methods.pf.ioctl') @patch('sshuttle.methods.pf.pf_get_dev') -def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): +def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl, + mock_subprocess_call): mock_pfctl.side_effect = pfctl method = get_method('pf') @@ -312,6 +314,7 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): b'to <dns_servers> port 53 keep state\n'), call('-e'), ] + assert call(['kldload', 'pf']) in mock_subprocess_call.mock_calls mock_pf_get_dev.reset_mock() mock_ioctl.reset_mock() mock_pfctl.reset_mock() @@ -364,9 +367,11 @@ def test_setup_firewall_freebsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): mock_pfctl.reset_mock() method.restore_firewall(1025, 2, False, None) + method.restore_firewall(1024, 10, False, None) assert mock_ioctl.mock_calls == [] assert mock_pfctl.mock_calls == [ call('-a sshuttle-1025 -F all'), + call('-a sshuttle6-1024 -F all'), call("-d"), ] mock_pf_get_dev.reset_mock() @@ -467,10 +472,12 @@ def test_setup_firewall_openbsd(mock_pf_get_dev, mock_ioctl, mock_pfctl): mock_pfctl.reset_mock() method.restore_firewall(1025, 2, False, None) + method.restore_firewall(1024, 10, False, None) assert mock_ioctl.mock_calls == [] assert mock_pfctl.mock_calls == [ call('-a sshuttle-1025 -F all'), - call("-d"), + call('-a sshuttle6-1024 -F all'), + call('-d'), ] mock_pf_get_dev.reset_mock() mock_pfctl.reset_mock() |