p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix dedent after merge.

This commit is contained in:
turturica 2018-08-24 11:54:04 -07:00
parent 3396225f74
commit 459b040d21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
testing/python/fixture.py
View File

@ -3998,7 +3998,7 @@ class TestScopeOrdering(object):
sub1 = root.mkdir("sub1") sub1 = root.mkdir("sub1")
sub1.ensure("__init__.py") sub1.ensure("__init__.py")
sub1.join("conftest.py").write( sub1.join("conftest.py").write(
dedent( textwrap.dedent(
"""\ """\
import pytest import pytest
from .. import values from .. import values
@ -4011,7 +4011,7 @@ class TestScopeOrdering(object):
) )
) )
sub1.join("test_1.py").write( sub1.join("test_1.py").write(
dedent( textwrap.dedent(
"""\ """\
from .. import values from .. import values
def test_1(fix): def test_1(fix):
@ -4022,7 +4022,7 @@ class TestScopeOrdering(object):
sub2 = root.mkdir("sub2") sub2 = root.mkdir("sub2")
sub2.ensure("__init__.py") sub2.ensure("__init__.py")
sub2.join("conftest.py").write( sub2.join("conftest.py").write(
dedent( textwrap.dedent(
"""\ """\
import pytest import pytest
from .. import values from .. import values
@ -4035,7 +4035,7 @@ class TestScopeOrdering(object):
) )
) )
sub2.join("test_2.py").write( sub2.join("test_2.py").write(
dedent( textwrap.dedent(
"""\ """\
from .. import values from .. import values
def test_2(fix): def test_2(fix):