Merge default

2014-07-18 01:34:08 +01:00
parent 2d7a32f7ea 7b630d9080
commit 1641d00cb1
45 changed files with 645 additions and 427 deletions
--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -641,7 +641,7 @@ class TestTracebackCutting:
        assert "x = 1" not in out
        assert "x = 2" not in out
        result.stdout.fnmatch_lines([
-            ">*asd*",
+            " *asd*",
            "E*NameError*",
        ])
        result = testdir.runpytest("--fulltrace")