black formatting.

This commit is contained in:
Christian Neumüller 2019-08-27 16:16:45 +02:00
parent 505c3340bf
commit 1aac64573f
1 changed files with 6 additions and 8 deletions

View File

@ -1,11 +1,12 @@
import os.path
import textwrap import textwrap
import py import py
import pytest import pytest
from _pytest.config import PytestPluginManager, _uniquepath from _pytest.config import _uniquepath
from _pytest.config import PytestPluginManager
from _pytest.main import ExitCode from _pytest.main import ExitCode
import os.path
def ConftestWithSetinitial(path): def ConftestWithSetinitial(path):
@ -275,18 +276,15 @@ def test_conftest_symlink_files(testdir):
result.stdout.fnmatch_lines(["*conftest_loaded*", "PASSED"]) result.stdout.fnmatch_lines(["*conftest_loaded*", "PASSED"])
assert result.ret == ExitCode.OK assert result.ret == ExitCode.OK
@pytest.mark.skipif( @pytest.mark.skipif(
os.path.normcase('x') != os.path.normcase('X'), os.path.normcase("x") != os.path.normcase("X"),
reason="only relevant for case insensitive file systems", reason="only relevant for case insensitive file systems",
) )
def test_conftest_badcase(testdir): def test_conftest_badcase(testdir):
"""Check conftest.py loading when directory casing is wrong.""" """Check conftest.py loading when directory casing is wrong."""
testdir.tmpdir.mkdir("JenkinsRoot").mkdir("test") testdir.tmpdir.mkdir("JenkinsRoot").mkdir("test")
source = { source = {"setup.py": "", "test/__init__.py": "", "test/conftest.py": ""}
"setup.py": "",
"test/__init__.py": "",
"test/conftest.py": ""
}
testdir.makepyfile(**{"JenkinsRoot/%s" % k: v for k, v in source.items()}) testdir.makepyfile(**{"JenkinsRoot/%s" % k: v for k, v in source.items()})
testdir.tmpdir.join("jenkinsroot/test").chdir() testdir.tmpdir.join("jenkinsroot/test").chdir()