diff options
| author | vieira <vieira@yubo.be> | 2017-02-09 01:29:56 +0000 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2017-02-11 09:07:50 +1100 |
| commit | 9a9015a75e956ade88846c3054a10817ab7688e0 (patch) | |
| tree | bc50cafd171dc16803d579092450abd332b61331 | |
| parent | d7d24f956be302e99cea30df83ccbde3437ec4e1 (diff) | |
Fixed tests after adding support for iproute2
| -rw-r--r-- | sshuttle/tests/server/test_server.py | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/sshuttle/tests/server/test_server.py b/sshuttle/tests/server/test_server.py index 3c530e8..b687316 100644 --- a/sshuttle/tests/server/test_server.py +++ b/sshuttle/tests/server/test_server.py @@ -21,8 +21,9 @@ def test__maskbits(): sshuttle.server._maskbits(netmask) +@patch('sshuttle.server.which', side_effect=lambda x: x == 'netstat') @patch('sshuttle.server.ssubprocess.Popen') -def test__listroutes(mock_popen): +def test_listroutes_netstat(mock_popen, mock_which): mock_pobj = Mock() mock_pobj.stdout = io.BytesIO(b""" Kernel IP routing table @@ -33,30 +34,20 @@ Destination Gateway Genmask Flags MSS Window irtt Iface mock_pobj.wait.return_value = 0 mock_popen.return_value = mock_pobj - routes = sshuttle.server._list_routes() + routes = sshuttle.server.list_routes() - env = { - 'PATH': os.environ['PATH'], - 'LC_ALL': "C", - } - assert mock_popen.mock_calls == [ - call(['netstat', '-rn'], stdout=-1, env=env), - call().wait() - ] - assert routes == [ - (socket.AF_INET, '0.0.0.0', 0), + assert list(routes) == [ (socket.AF_INET, '192.168.1.0', 24) ] +@patch('sshuttle.server.which', side_effect=lambda x: x == 'ip') @patch('sshuttle.server.ssubprocess.Popen') -def test_listroutes(mock_popen): +def test_listroutes_iproute(mock_popen, mock_which): mock_pobj = Mock() mock_pobj.stdout = io.BytesIO(b""" -Kernel IP routing table -Destination Gateway Genmask Flags MSS Window irtt Iface -0.0.0.0 192.168.1.1 0.0.0.0 UG 0 0 0 wlan0 -192.168.1.0 0.0.0.0 255.255.255.0 U 0 0 0 wlan0 +default via 192.168.1.1 dev wlan0 proto static +192.168.1.0/24 dev wlan0 proto kernel scope link src 192.168.1.1 """) mock_pobj.wait.return_value = 0 mock_popen.return_value = mock_pobj |