diff options
| author | Travis Ens <ens.travis@gmail.com> | 2020-12-29 17:21:27 -0500 |
|---|---|---|
| committer | Travis Ens <ens.travis@gmail.com> | 2020-12-29 17:21:27 -0500 |
| commit | 5c4ba10a5326e895b63668cd6aabc437db71c21b (patch) | |
| tree | f40a7c3f28bd17a30514ec193077df19ccc64b37 | |
| parent | 404139ecd126d99fc20efd03b4c3f462543f7fbe (diff) | |
| download | qutebrowser-5c4ba10a5326e895b63668cd6aabc437db71c21b.tar.gz qutebrowser-5c4ba10a5326e895b63668cd6aabc437db71c21b.zip | |
Ensure all tests have known starting states
| -rw-r--r-- | tests/unit/config/test_qtargs.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py index 8cf458aa7..b38fab41d 100644 --- a/tests/unit/config/test_qtargs.py +++ b/tests/unit/config/test_qtargs.py @@ -429,16 +429,12 @@ class TestEnvVars: assert os.environ[envvar] == expected @pytest.mark.parametrize('init_val, config_val', [ - ( # Test setting a variable - {'QT_SCALE_FACTOR': None}, - {'QT_SCALE_FACTOR': '2'}, - ), ( # Test changing a set variable {'QT_SCALE_FACTOR': '2'}, {'QT_SCALE_FACTOR': '4'}, ), ( # Test setting an unset variable - {'QT_SCALE_FACTOR': 'unset'}, + {'QT_SCALE_FACTOR': None}, {'QT_SCALE_FACTOR': '3'}, ), ( # Test unsetting a variable which is set @@ -446,11 +442,11 @@ class TestEnvVars: {'QT_SCALE_FACTOR': None}, ), ( # Test unsetting a variable which is unset - {'QT_SCALE_FACTOR': 'unset'}, + {'QT_SCALE_FACTOR': None}, {'QT_SCALE_FACTOR': None}, ), ( # Test setting multiple variables - {'QT_SCALE_FACTOR': None, 'QT_PLUGIN_PATH': None, 'QT_NEWVAR': None}, + {'QT_SCALE_FACTOR': '0', 'QT_PLUGIN_PATH': '/usr/bin', 'QT_NEWVAR': None}, {'QT_SCALE_FACTOR': '3', 'QT_PLUGIN_PATH': '/tmp/', 'QT_NEWVAR': 'newval'}, ) ]) @@ -458,11 +454,11 @@ class TestEnvVars: init_val, config_val): """Test setting environment variables using qt.environ.""" for var, val in init_val.items(): - if val is not None: - if val == 'unset': - monkeypatch.delenv(var) - else: - monkeypatch.setenv(var, val) + if val is None: + monkeypatch.setenv(var, '0') + monkeypatch.delenv(var, raising=False) + else: + monkeypatch.setenv(var, val) config_stub.val.qt.environ = config_val qtargs.init_envvars() |