summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-18 11:04:39 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-03-18 11:04:39 +0100
commitca8c3205857bf81a06f8f36aae999303281412e2 (patch)
tree81c47111da2249a932b2fa89f95ca879f7d7b470
parentc07b93b7c40aef496e8e0a298e4fbafedf4ee8d0 (diff)
downloadqutebrowser-ca8c3205857bf81a06f8f36aae999303281412e2.tar.gz
qutebrowser-ca8c3205857bf81a06f8f36aae999303281412e2.zip
Add a test for flatpak runtime dir
See #6300
-rw-r--r--qutebrowser/browser/history.py2
-rw-r--r--tests/unit/utils/test_standarddir.py11
2 files changed, 12 insertions, 1 deletions
diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 9eaa88760..773c6cc51 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -178,7 +178,7 @@ class WebHistory(sql.SqlTable):
try:
rebuild_completion = self.metainfo['force_rebuild']
- except sql.BugError:
+ except sql.BugError: # pragma: no cover
log.sql.warning("Failed to access meta info, trying to recover...",
exc_info=True)
self.metainfo.try_recover()
diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py
index 5b24ed962..c8a7f47e5 100644
--- a/tests/unit/utils/test_standarddir.py
+++ b/tests/unit/utils/test_standarddir.py
@@ -202,6 +202,17 @@ class TestStandardDir:
standarddir._init_runtime(args=None)
assert standarddir.runtime() == str(tmpdir_env / APPNAME)
+ def test_flatpak_runtimedir(self, monkeypatch, tmp_path):
+ app_id = 'org.qutebrowser.qutebrowser'
+ expected = tmp_path / 'app' / app_id
+
+ monkeypatch.setattr(standarddir.version, 'is_flatpak', lambda: True)
+ monkeypatch.setenv('XDG_RUNTIME_DIR', str(tmp_path))
+ monkeypatch.setenv('FLATPAK_ID', app_id)
+
+ standarddir._init_runtime(args=None)
+ assert standarddir.runtime() == str(expected)
+
@pytest.mark.fake_os('windows')
def test_runtimedir_empty_tempdir(self, monkeypatch, tmpdir):
"""With an empty tempdir on non-Linux, we should raise."""