floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove the unused return value of fnmatch_lines

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Benjamin Peterson
2010-04-28 17:12:38 -05:00
parent f2be437daa
commit d93016d85f
13 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testing/plugin/test_pytest_capture.py
View File

@@ -187,7 +187,7 @@ class TestPerTestCapturing:
pass
""")
result = testdir.runpytest(p)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
'*teardown_function*',
'*Captured stdout*',
"setup func1*",
@@ -205,7 +205,7 @@ class TestPerTestCapturing:
pass
""")
result = testdir.runpytest(p)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*def teardown_module(mod):*",
"*Captured stdout*",
"*teardown module*",
@@ -271,7 +271,7 @@ class TestLoggingInteraction:
print ("suspend2 and captured %s" % (outerr,))
""")
result = testdir.runpython(p)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"suspeneded and captured*hello1*",
"suspend2 and captured*hello2*WARNING:root:hello3*",
])
@@ -358,7 +358,7 @@ class TestCaptureFuncarg:
pass
""")
result = testdir.runpytest(p)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*test_partial_setup_failure*",
"*1 error*",
])

4
testing/plugin/test_pytest_default.py
View File

@@ -23,7 +23,7 @@ def test_exclude(testdir):
testdir.makepyfile(test_ok="def test_pass(): pass")
result = testdir.runpytest("--ignore=hello", "--ignore=hello2")
assert result.ret == 0
assert result.stdout.fnmatch_lines(["*1 passed*"])
result.stdout.fnmatch_lines(["*1 passed*"])
def test_pytest_report_iteminfo():
class FakeItem(object):
@@ -43,4 +43,4 @@ def test_conftest_confcutdir(testdir):
parser.addoption("--xyz", action="store_true")
"""))
result = testdir.runpytest("-h", "--confcutdir=%s" % x, x)
assert result.stdout.fnmatch_lines(["*--xyz*"])
result.stdout.fnmatch_lines(["*--xyz*"])

6
testing/plugin/test_pytest_helpconfig.py
View File

@@ -6,14 +6,14 @@ def test_version(testdir):
result = testdir.runpytest("--version")
assert result.ret == 0
#p = py.path.local(py.__file__).dirpath()
assert result.stderr.fnmatch_lines([
result.stderr.fnmatch_lines([
'*py.test*%s*imported from*' % (py.version, )
])
def test_helpconfig(testdir):
result = testdir.runpytest("--help-config")
assert result.ret == 0
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*cmdline*conftest*ENV*",
])
@@ -36,7 +36,7 @@ def test_hookvalidation_unknown(testdir):
""")
result = testdir.runpytest()
assert result.ret != 0
assert result.stderr.fnmatch_lines([
result.stderr.fnmatch_lines([
'*unknown hook*pytest_hello*'
])

2
testing/plugin/test_pytest_mark.py
View File

@@ -56,7 +56,7 @@ class TestFunctional:
assert hasattr(test_hello, 'hello')
""")
result = testdir.runpytest(p)
assert result.stdout.fnmatch_lines(["*passed*"])
result.stdout.fnmatch_lines(["*passed*"])
def test_mark_per_module(self, testdir):
item = testdir.getitem("""

2
testing/plugin/test_pytest_pytester.py
View File

@@ -63,7 +63,7 @@ def test_testdir_runs_with_plugin(testdir):
assert 1
""")
result = testdir.runpytest()
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*1 passed*"
])

2
testing/plugin/test_pytest_runner.py
View File

@@ -310,7 +310,7 @@ def test_runtest_in_module_ordering(testdir):
del item.function.mylist
""")
result = testdir.runpytest(p1)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*2 passed*"
])

16
testing/plugin/test_pytest_skipping.py
View File

@@ -8,7 +8,7 @@ def test_xfail_not_report_default(testdir):
assert 0
""")
result = testdir.runpytest(p, '-v')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*1 expected failures*--report=xfailed*",
])
@@ -19,7 +19,7 @@ def test_skip_not_report_default(testdir):
py.test.skip("hello")
""")
result = testdir.runpytest(p, '-v')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*1 skipped*--report=skipped*",
])
@@ -35,7 +35,7 @@ def test_xfail_decorator(testdir):
assert 1
""")
result = testdir.runpytest(p, '--report=xfailed')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*expected failures*",
"*test_one.test_this*test_one.py:4*",
"*UNEXPECTEDLY PASSING*",
@@ -52,7 +52,7 @@ def test_xfail_at_module(testdir):
assert 0
""")
result = testdir.runpytest(p, '--report=xfailed')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*expected failures*",
"*test_intentional_xfail*:4*",
"*1 xfailed*"
@@ -67,7 +67,7 @@ def test_xfail_evalfalse_but_fails(testdir):
assert 0
""")
result = testdir.runpytest(p, '--report=xfailed')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*test_xfail_evalfalse_but_fails*:4*",
"*1 failed*"
])
@@ -81,7 +81,7 @@ def test_skipif_decorator(testdir):
assert 0
""")
result = testdir.runpytest(p, '--report=skipped')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*Skipped*platform*",
"*1 skipped*"
])
@@ -99,7 +99,7 @@ def test_skipif_class(testdir):
assert 0
""")
result = testdir.runpytest(p)
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*2 skipped*"
])
@@ -165,7 +165,7 @@ def test_skipped_reasons_functional(testdir):
"""
)
result = testdir.runpytest('--report=skipped')
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*test_one.py ss",
"*test_two.py S",
"___* skipped test summary *_",

14
testing/plugin/test_pytest_terminal.py
View File

@@ -226,7 +226,7 @@ class TestTerminal:
pass
""")
result = testdir.runpytest(p2)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*test_p2.py .",
"*1 passed*",
])
@@ -461,7 +461,7 @@ class TestTerminalFunctional:
"""
)
result = testdir.runpytest("-k", "test_two:", testpath)
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*test_deselected.py ..",
"=* 1 test*deselected by 'test_two:'*=",
])
@@ -494,7 +494,7 @@ class TestTerminalFunctional:
result = testdir.runpytest()
finally:
old.chdir()
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"test_passes.py ..",
"* 2 pass*",
])
@@ -507,7 +507,7 @@ class TestTerminalFunctional:
""")
result = testdir.runpytest()
verinfo = ".".join(map(str, py.std.sys.version_info[:3]))
extra = result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*===== test session starts ====*",
"python: platform %s -- Python %s*" %(
py.std.sys.platform, verinfo), # , py.std.sys.executable),
@@ -577,13 +577,13 @@ def test_terminalreporter_reportopt_conftestsetting(testdir):
assert not tr.hasopt('qwe')
""")
result = testdir.runpytest()
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*1 passed*"
])
def test_trace_reporting(testdir):
result = testdir.runpytest("--traceconfig")
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*active plugins*"
])
assert result.ret == 0
@@ -592,7 +592,7 @@ def test_trace_reporting(testdir):
def test_show_funcarg(testdir, option):
args = option._getcmdargs() + ["--funcargs"]
result = testdir.runpytest(*args)
assert result.stdout.fnmatch_lines([
result.stdout.fnmatch_lines([
"*tmpdir*",
"*temporary directory*",
]