diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-03-30 21:27:16 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-03-31 13:29:54 +0200 |
| commit | d7913f78f65136308f18369ef95916200fc80cd4 (patch) | |
| tree | 9cc50c5d868588ac250f46c54f7a4db2e9e5f08a | |
| parent | 0a4cb0ef7fbbbf590b3fb0faade280b18b8d0dd7 (diff) | |
| download | qutebrowser-d7913f78f65136308f18369ef95916200fc80cd4.tar.gz qutebrowser-d7913f78f65136308f18369ef95916200fc80cd4.zip | |
flatpak: Fix standarddir/ipc tests
(cherry picked from commit f35e284de01ac1bc6e81000063ad8b0525ac1354)
| -rw-r--r-- | tests/unit/misc/test_ipc.py | 17 | ||||
| -rw-r--r-- | tests/unit/utils/test_standarddir.py | 7 |
2 files changed, 22 insertions, 2 deletions
diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 7df7d53c4..e93578853 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -36,7 +36,7 @@ from PyQt5.QtTest import QSignalSpy import qutebrowser from qutebrowser.misc import ipc -from qutebrowser.utils import standarddir, utils +from qutebrowser.utils import standarddir, utils, version from helpers import stubs, testutils @@ -219,6 +219,7 @@ class TestSocketName: assert parts[-1] == expected @pytest.mark.linux + @pytest.mark.not_flatpak @pytest.mark.parametrize('basedir, expected', [ (None, 'ipc-{}'.format(md5('testusername'))), ('/x', 'ipc-{}'.format(md5('testusername-/x'))), @@ -228,6 +229,20 @@ class TestSocketName: expected_path = str(fake_runtime_dir / 'qutebrowser' / expected) assert socketname == expected_path + # We can't use the fake_flatpak fixture here, because it conflicts with + # fake_runtime_dir... + @pytest.mark.linux + @pytest.mark.parametrize('basedir, expected', [ + (None, 'ipc-{}'.format(md5('testusername'))), + ('/x', 'ipc-{}'.format(md5('testusername-/x'))), + ]) + @pytest.mark.skipif(not version.is_flatpak(), reason="Needs Flatpak") + def test_flatpak(self, basedir, fake_runtime_dir, expected): + socketname = ipc._get_socketname(basedir) + expected_path = str( + fake_runtime_dir / 'app' / 'org.qutebrowser.qutebrowser' / expected) + assert socketname == expected_path + def test_other_unix(self): """Fake test for POSIX systems which aren't Linux/macOS. diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py index 88abcd255..a16cb3c04 100644 --- a/tests/unit/utils/test_standarddir.py +++ b/tests/unit/utils/test_standarddir.py @@ -155,7 +155,12 @@ class TestStandardDir: (lambda: standarddir.config(auto=True), standarddir._init_config, 'XDG_CONFIG_HOME'), (standarddir.cache, standarddir._init_cache, 'XDG_CACHE_HOME'), - (standarddir.runtime, standarddir._init_runtime, 'XDG_RUNTIME_DIR'), + pytest.param( + standarddir.runtime, + standarddir._init_runtime, + 'XDG_RUNTIME_DIR', + marks=pytest.mark.not_flatpak, + ), ]) @pytest.mark.linux def test_linux_explicit(self, monkeypatch, tmpdir, |