From 3dc67df180bdce1f26a277bd27b85b0dde0bd72a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 13 Sep 2017 23:28:02 +0200 Subject: [PATCH] Fix minor standarddir migration issues --- qutebrowser/utils/standarddir.py | 2 +- tests/unit/utils/test_standarddir.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index a6df75948..6415cb8b7 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -367,7 +367,7 @@ def _move_data(old, new): log.init.debug("Migrating data from {} to {}".format(old, new)) if os.path.exists(new): - if os.listdir(new): + if not os.path.isdir(new) or os.listdir(new): message.error("Failed to move data from {} as {} is non-empty!" .format(old, new)) return False diff --git a/tests/unit/utils/test_standarddir.py b/tests/unit/utils/test_standarddir.py index a9b30750c..001e3512f 100644 --- a/tests/unit/utils/test_standarddir.py +++ b/tests/unit/utils/test_standarddir.py @@ -57,6 +57,7 @@ def test_fake_mac_config(tmpdir, monkeypatch): # needs AppDataLocation @pytest.mark.qt55 @pytest.mark.parametrize('what', ['data', 'config']) +@pytest.mark.not_mac def test_fake_windows_data_config(tmpdir, monkeypatch, what): """Make sure the config is correct on a fake Windows.""" monkeypatch.setattr(os, 'name', 'nt') @@ -158,8 +159,8 @@ class TestStandardDir: @pytest.mark.parametrize('func, elems, expected', [ (standarddir.data, 2, ['Application Support', 'qute_test']), - (standarddir.config, 1, ['qute_test']), - (lambda: standarddir.config(auto=True), 0, + (lambda: standarddir.config(auto=True), 1, ['qute_test']), + (standarddir.config, 0, os.path.expanduser('~').split(os.sep) + ['.qutebrowser']), (standarddir.cache, 2, ['Caches', 'qute_test']), (standarddir.download, 1, ['Downloads']),