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

fixes to against python3.3

Browse Source
This commit is contained in:
holger krekel
2012-10-01 10:14:54 +02:00
parent 57a832812b
commit 5173647b4d
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/acceptance_test.py
+3 -3
View File
@@ -71,7 +71,7 @@ class TestGeneralUsage:
"*---configure",
"*---unconfigure",
])
def test_config_preparse_plugin_option(self, testdir):
testdir.makepyfile(pytest_xyz="""
@@ -357,13 +357,13 @@ class TestInvocationVariants:
@pytest.mark.skipif("sys.version_info < (2,5)")
def test_python_minus_m_invocation_ok(self, testdir):
p1 = testdir.makepyfile("def test_hello(): pass")
res = testdir.run(py.std.sys.executable, "-m", "py.test", str(p1))
res = testdir.run(py.std.sys.executable, "-m", "pytest", str(p1))
assert res.ret == 0
@pytest.mark.skipif("sys.version_info < (2,5)")
def test_python_minus_m_invocation_fail(self, testdir):
p1 = testdir.makepyfile("def test_fail(): 0/0")
res = testdir.run(py.std.sys.executable, "-m", "py.test", str(p1))
res = testdir.run(py.std.sys.executable, "-m", "pytest", str(p1))
assert res.ret == 1
@pytest.mark.skipif("sys.version_info < (2,5)")
testing/test_python.py
+1 -1
View File
@@ -2391,7 +2391,7 @@ class TestFuncargMarker:
def test_3(self):
pass
""")
result = testdir.runpytest("-v")
result = testdir.runpytest("-vs")
result.stdout.fnmatch_lines("""
test_class_ordering.py:4: TestClass2.test_1[1-a] PASSED
test_class_ordering.py:4: TestClass2.test_1[2-a] PASSED