Commit 3367124e authored by Brian May's avatar Brian May

Fix more brokenness.

parent aaa60623
...@@ -233,7 +233,7 @@ class Method(BaseMethod): ...@@ -233,7 +233,7 @@ class Method(BaseMethod):
pfctl('-a sshuttle -F all') pfctl('-a sshuttle -F all')
if sys.platform == "darwin": if sys.platform == "darwin":
if _pf_context['Xtoken'] is not None: if _pf_context['Xtoken'] is not None:
pfctl('-X %s' % _pf_context['Xtoken']) pfctl('-X %s' % _pf_context['Xtoken'].decode("ASCII"))
elif _pf_context['started_by_sshuttle']: elif _pf_context['started_by_sshuttle']:
pfctl('-d') pfctl('-d')
......
...@@ -176,7 +176,7 @@ def test_setup_firewall(mock_pf_get_dev, mock_ioctl, mock_pfctl): ...@@ -176,7 +176,7 @@ def test_setup_firewall(mock_pf_get_dev, mock_ioctl, mock_pfctl):
assert mock_ioctl.mock_calls == [] assert mock_ioctl.mock_calls == []
assert mock_pfctl.mock_calls == [ assert mock_pfctl.mock_calls == [
call('-a sshuttle -F all'), call('-a sshuttle -F all'),
call("-X b'abcdefg'"), call("-X abcdefg"),
] ]
mock_pf_get_dev.reset_mock() mock_pf_get_dev.reset_mock()
mock_pfctl.reset_mock() mock_pfctl.reset_mock()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment