From bb567a61b62342aaa28e0dafe777768954dd4149 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 9 Jul 2017 22:09:31 +0200 Subject: [PATCH] Fix ipc test coverage --- qutebrowser/misc/ipc.py | 2 +- tests/unit/misc/test_ipc.py | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py index 03ccab729..562cc84cc 100644 --- a/qutebrowser/misc/ipc.py +++ b/qutebrowser/misc/ipc.py @@ -51,7 +51,7 @@ def _get_socketname_windows(basedir): def _get_socketname(basedir): """Get a socketname to use.""" - if os.name == 'nt': + if os.name == 'nt': # pragma: no cover return _get_socketname_windows(basedir) parts_to_hash = [getpass.getuser()] diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 4a530a10b..d0758b28d 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -186,19 +186,26 @@ class TestSocketName: ('/x', 'ipc-{}'.format(md5('testusername-/x'))), ] + WINDOWS_TESTS = [ + (None, 'qutebrowser-testusername'), + ('/x', 'qutebrowser-testusername-{}'.format(md5('/x'))), + ] + @pytest.fixture(autouse=True) def patch_user(self, monkeypatch): monkeypatch.setattr(ipc.getpass, 'getuser', lambda: 'testusername') - @pytest.mark.parametrize('basedir, expected', [ - (None, 'qutebrowser-testusername'), - ('/x', 'qutebrowser-testusername-{}'.format(md5('/x'))), - ]) + @pytest.mark.parametrize('basedir, expected', WINDOWS_TESTS) @pytest.mark.windows def test_windows(self, basedir, expected): socketname = ipc._get_socketname(basedir) assert socketname == expected + @pytest.mark.parametrize('basedir, expected', WINDOWS_TESTS) + def test_windows_on_posix(self, basedir, expected): + socketname = ipc._get_socketname_windows(basedir) + assert socketname == expected + @pytest.mark.mac @pytest.mark.parametrize('basedir, expected', POSIX_TESTS) def test_mac(self, basedir, expected):