extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-03-10 21:18:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use readline instead of next.

Browse Source
This commit is contained in:
Brian May 2015-11-17 09:39:53 +11:00
parent 71d17e449e
commit 641a193d3d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sshuttle/tests/test_firewall.py
View File

@ -41,22 +41,22 @@ def test_rewrite_etc_hosts():
} }
sshuttle.firewall.rewrite_etc_hosts(10) sshuttle.firewall.rewrite_etc_hosts(10)
with open("tmp/hosts") as f: with open("tmp/hosts") as f:
line = f.next() line = f.readline()
s = line.split() s = line.split()
assert s == ['1.2.3.3', 'existing'] assert s == ['1.2.3.3', 'existing']
line = f.next() line = f.readline()
s = line.split() s = line.split()
assert s == ['1.2.3.4', 'myhost', assert s == ['1.2.3.4', 'myhost',
'#', 'sshuttle-firewall-10', 'AUTOCREATED'] '#', 'sshuttle-firewall-10', 'AUTOCREATED']
line = f.next() line = f.readline()
s = line.split() s = line.split()
assert s == ['1.2.3.5', 'myotherhost', assert s == ['1.2.3.5', 'myotherhost',
'#', 'sshuttle-firewall-10', 'AUTOCREATED'] '#', 'sshuttle-firewall-10', 'AUTOCREATED']
with pytest.raises(StopIteration): line = f.readline()
line = f.next() assert line == ""
sshuttle.firewall.restore_etc_hosts(10) sshuttle.firewall.restore_etc_hosts(10)
assert filecmp.cmp("tmp/hosts.orig", "tmp/hosts", shallow=False) is True assert filecmp.cmp("tmp/hosts.orig", "tmp/hosts", shallow=False) is True