Skip to content

Commit 2185cd5

Browse files
author
Israel Fruchter (ifruchte)
committed
fixed the test, and stop using tox
1 parent 350af5e commit 2185cd5

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ python:
99
install:
1010
- pip install python-coveralls virtualenv
1111
# # command to run tests
12-
script: python setup.py test
13-
after_success:
12+
script:
1413
- pip install -r requirements-testing.txt -e .
1514
- py.test --cov=pytest_fixture_tools --cov-report=term-missing tests
1615
- coveralls

tests/test_fixture_duplicates.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ def arg2(request):
2929
assert result.stdout.lines.count('arg1') == 0
3030

3131

32-
@pytest.mark.skip(reason="py.io.TerminalWriter() isn't captured by testdir anymore")
3332
def test_there_are_fixture_duplicates(testdir):
3433
"""Check that --show-fixture-duplicates will give us list of duplicates."""
3534
sub1 = testdir.mkpydir("sub1")
@@ -51,7 +50,7 @@ def arg1(request):
5150
sub1.join("test_in_sub1.py").write("def test_1(arg1): pass")
5251
sub2.join("test_in_sub2.py").write("def test_2(arg1): pass")
5352

54-
result = testdir.runpytest('--show-fixture-duplicates')
53+
result = testdir.runpytest_subprocess('--show-fixture-duplicates', '-s')
5554

56-
assert result.stdout.lines.count('sub1/conftest.py:5') == 1
57-
assert result.stdout.lines.count('sub1/sub2/conftest.py:5') == 1
55+
result.stdout.fnmatch_lines('sub1/conftest.py:5')
56+
result.stdout.fnmatch_lines('sub1/sub2/conftest.py:5')

0 commit comments

Comments
 (0)