rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "standarddir: Fix runtime basedir test on OS X."

Browse Source 
This reverts commit 46ac1e2bf90f1c74a1cc502e08b717715b90eb39.
This commit is contained in:
Florian Bruhin 2015-09-15 20:48:39 +02:00
parent 89b4adf158
commit d887bbeb24
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pytest.ini
View File

@ -6,7 +6,6 @@ markers =
windows: Tests which only can run on Windows. windows: Tests which only can run on Windows.
linux: Tests which only can run on Linux. linux: Tests which only can run on Linux.
osx: Tests which only can run on OS X. osx: Tests which only can run on OS X.
not_osx: Tests which can not run on OS X.
not_frozen: Tests which can't be run if sys.frozen is True. not_frozen: Tests which can't be run if sys.frozen is True.
frozen: Tests which can only be run if sys.frozen is True. frozen: Tests which can only be run if sys.frozen is True.
integration: Tests which test a bigger portion of code, run without coverage. integration: Tests which test a bigger portion of code, run without coverage.

2
tests/conftest.py
View File

@ -90,8 +90,6 @@ def pytest_runtest_setup(item):
pytest.skip("Requires Linux.") pytest.skip("Requires Linux.")
elif item.get_marker('osx') and sys.platform != 'darwin': elif item.get_marker('osx') and sys.platform != 'darwin':
pytest.skip("Requires OS X.") pytest.skip("Requires OS X.")
elif item.get_marker('not_osx') and sys.platform == 'darwin':
pytest.skip("Skipped on OS X.")
elif item.get_marker('not_frozen') and getattr(sys, 'frozen', False): elif item.get_marker('not_frozen') and getattr(sys, 'frozen', False):
pytest.skip("Can't be run when frozen!") pytest.skip("Can't be run when frozen!")
elif item.get_marker('frozen') and not getattr(sys, 'frozen', False): elif item.get_marker('frozen') and not getattr(sys, 'frozen', False):

2
tests/unit/utils/test_standarddir.py
View File

@ -211,7 +211,7 @@ class TestArguments:
assert standarddir.runtime() == str(tmpdir / 'qute_test') assert standarddir.runtime() == str(tmpdir / 'qute_test')
@pytest.mark.parametrize('typ', ['config', 'data', 'cache', 'download', @pytest.mark.parametrize('typ', ['config', 'data', 'cache', 'download',
pytest.mark.not_osx('runtime')]) 'runtime'])
def test_basedir(self, tmpdir, typ): def test_basedir(self, tmpdir, typ):
"""Test --basedir.""" """Test --basedir."""
expected = str(tmpdir / typ) expected = str(tmpdir / typ)