Revert "standarddir: Fix runtime basedir test on OS X."
This reverts commit 46ac1e2bf90f1c74a1cc502e08b717715b90eb39.
This commit is contained in:
parent
89b4adf158
commit
d887bbeb24
@ -6,7 +6,6 @@ markers =
|
||||
windows: Tests which only can run on Windows.
|
||||
linux: Tests which only can run on Linux.
|
||||
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.
|
||||
frozen: Tests which can only be run if sys.frozen is True.
|
||||
integration: Tests which test a bigger portion of code, run without coverage.
|
||||
|
@ -90,8 +90,6 @@ def pytest_runtest_setup(item):
|
||||
pytest.skip("Requires Linux.")
|
||||
elif item.get_marker('osx') and sys.platform != 'darwin':
|
||||
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):
|
||||
pytest.skip("Can't be run when frozen!")
|
||||
elif item.get_marker('frozen') and not getattr(sys, 'frozen', False):
|
||||
|
@ -211,7 +211,7 @@ class TestArguments:
|
||||
assert standarddir.runtime() == str(tmpdir / 'qute_test')
|
||||
|
||||
@pytest.mark.parametrize('typ', ['config', 'data', 'cache', 'download',
|
||||
pytest.mark.not_osx('runtime')])
|
||||
'runtime'])
|
||||
def test_basedir(self, tmpdir, typ):
|
||||
"""Test --basedir."""
|
||||
expected = str(tmpdir / typ)
|
||||
|
Loading…
Reference in New Issue
Block a user