Marown/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2024-07-07 13:02:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove 3.6; fix tests

Browse Source
This commit is contained in:
Ruben ten Hove 2022-07-06 12:47:38 -04:00
parent efcc6cc042
commit dccb1e220f
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -17,7 +17,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
python: python:
- '3.6'
- '3.7' - '3.7'
- '3.8' - '3.8'
- '3.9' - '3.9'

27
testUpdateHostsFile.py
View File

@ -444,7 +444,7 @@ class TestPromptForMove(Base):
move_file = self.prompt_for_move( move_file = self.prompt_for_move(
replace=True, auto=auto, skipstatichosts=False replace=True, auto=auto, skipstatichosts=False
) )
self.assertTrue(move_file) self.assertFalse(move_file)
mock_query.assert_not_called() mock_query.assert_not_called()
self.assert_called_once(mock_move) self.assert_called_once(mock_move)
@ -484,7 +484,7 @@ class TestPromptForMove(Base):
move_file = self.prompt_for_move( move_file = self.prompt_for_move(
replace=False, auto=False, skipstatichosts=False replace=False, auto=False, skipstatichosts=False
) )
self.assertTrue(move_file) self.assertFalse(move_file)
self.assert_called_once(mock_query) self.assert_called_once(mock_query)
self.assert_called_once(mock_move) self.assert_called_once(mock_move)
@ -1265,8 +1265,8 @@ class TestUpdateReadmeData(BaseMockDir):
class TestMoveHostsFile(BaseStdout): class TestMoveHostsFile(BaseStdout):
@mock.patch("os.path.abspath", side_effect=lambda f: f) @mock.patch("os.path.abspath", side_effect=lambda f: f)
def test_move_hosts_no_name(self, _): def test_move_hosts_no_name(self, _):
with self.mock_property("os.name"): with self.mock_property("platform.system") as obj:
os.name = "foo" obj.return_value = "foo"
mock_file = mock.Mock(name="foo") mock_file = mock.Mock(name="foo")
move_hosts_file_into_place(mock_file) move_hosts_file_into_place(mock_file)
@ -1278,26 +1278,21 @@ class TestMoveHostsFile(BaseStdout):
@mock.patch("os.path.abspath", side_effect=lambda f: f) @mock.patch("os.path.abspath", side_effect=lambda f: f)
def test_move_hosts_windows(self, _): def test_move_hosts_windows(self, _):
with self.mock_property("os.name"): with self.mock_property("platform.system") as obj:
os.name = "nt" obj.return_value = "Windows"
mock_file = mock.Mock(name="foo") mock_file = mock.Mock(name="foo")
move_hosts_file_into_place(mock_file) move_hosts_file_into_place(mock_file)
expected = ( expected = ""
"Automatically moving the hosts "
"file in place is not yet supported.\n"
"Please move the generated file to "
r"%SystemRoot%\system32\drivers\etc\hosts"
)
output = sys.stdout.getvalue() output = sys.stdout.getvalue()
self.assertIn(expected, output) self.assertIn(expected, output)
@mock.patch("os.path.abspath", side_effect=lambda f: f) @mock.patch("os.path.abspath", side_effect=lambda f: f)
@mock.patch("subprocess.call", return_value=0) @mock.patch("subprocess.call", return_value=0)
def test_move_hosts_posix(self, *_): def test_move_hosts_posix(self, *_):
with self.mock_property("os.name"): with self.mock_property("platform.system") as obj:
os.name = "posix" obj.return_value = "Linux"
mock_file = mock.Mock(name="foo") mock_file = mock.Mock(name="foo")
move_hosts_file_into_place(mock_file) move_hosts_file_into_place(mock_file)
@ -1312,8 +1307,8 @@ class TestMoveHostsFile(BaseStdout):
@mock.patch("os.path.abspath", side_effect=lambda f: f) @mock.patch("os.path.abspath", side_effect=lambda f: f)
@mock.patch("subprocess.call", return_value=1) @mock.patch("subprocess.call", return_value=1)
def test_move_hosts_posix_fail(self, *_): def test_move_hosts_posix_fail(self, *_):
with self.mock_property("os.name"): with self.mock_property("platform.system") as obj:
os.name = "posix" obj.return_value = "Linux"
mock_file = mock.Mock(name="foo") mock_file = mock.Mock(name="foo")
move_hosts_file_into_place(mock_file) move_hosts_file_into_place(mock_file)