fixes to various tests, related to execnet automatic ID generation and other bits.

also lowering the version as "1.1.1post1" for now.  1.1.2 is still a bit off.

--HG--
branch : trunk
This commit is contained in:
holger krekel
2009-12-24 19:43:14 +01:00
parent 98863d1d01
commit f254b6f7c1
9 changed files with 28 additions and 26 deletions

View File

@@ -36,8 +36,8 @@ class TestPDB:
assert i == 1
""")
child = testdir.spawn_pytest("--pdb %s" % p1)
#child.expect(".*def test_1.*")
child.expect(".*i = 0.*")
child.expect(".*def test_1")
child.expect(".*i = 0")
child.expect("(Pdb)")
child.sendeof()
child.expect("1 failed")
@@ -50,7 +50,7 @@ class TestPDB:
py.test.raises(Error, "testdir.parseconfigure('--pdb', '--looponfail')")
result = testdir.runpytest("--pdb", "-n", "3")
assert result.ret != 0
assert "incompatible" in result.stdout.str()
assert "incompatible" in result.stderr.str()
result = testdir.runpytest("--pdb", "-d", "--tx", "popen")
assert result.ret != 0
assert "incompatible" in result.stdout.str()
assert "incompatible" in result.stderr.str()