From 9383452ab91626f8f8bdfaf4d97f4a270875ae65 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 3 Oct 2017 13:05:01 +0200 Subject: [PATCH] Use a real YAML config for config tests --- tests/helpers/stubs.py | 3 --- tests/unit/config/test_config.py | 10 +++------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py index 74407037a..e68b7cc15 100644 --- a/tests/helpers/stubs.py +++ b/tests/helpers/stubs.py @@ -417,9 +417,6 @@ class FakeYamlConfig: self.loaded = False self._values = {} - def load(self): - self.loaded = True - def __contains__(self, item): return item in self._values diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index 539b59dc2..f1bed1060 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -25,7 +25,7 @@ import pytest from PyQt5.QtCore import QObject from PyQt5.QtGui import QColor -from qutebrowser.config import config, configdata, configexc +from qutebrowser.config import config, configdata, configexc, configfiles from qutebrowser.utils import usertypes from qutebrowser.misc import objects @@ -258,8 +258,8 @@ class TestKeyConfig: class TestConfig: @pytest.fixture - def conf(self, stubs): - yaml_config = stubs.FakeYamlConfig() + def conf(self, config_tmpdir): + yaml_config = configfiles.YamlConfig() return config.Config(yaml_config) def test_set_value(self, qtbot, conf, caplog): @@ -330,12 +330,8 @@ class TestConfig: assert conf._yaml[name2] is True def test_read_yaml(self, conf): - assert not conf._yaml.loaded conf._yaml['content.plugins'] = True - conf.read_yaml() - - assert conf._yaml.loaded assert conf._values['content.plugins'] is True def test_get_opt_valid(self, conf):