pytester: use no colors with inline runs by default (#58)

blueyed · web-flow · commit f153ad33d108 · 2019-11-02T13:13:33.000+01:00
Sets `PY_COLORS=0` in the environment by default, which is used by pylib.
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
@@ -496,7 +496,11 @@ def __init__(self, request, tmpdir_factory):
 
         # Environment (updates) for inner runs.
         tmphome = str(self.tmpdir)
-        self._env_run_update = {"HOME": tmphome, "USERPROFILE": tmphome}
+        self._env_run_update = {
+            "HOME": tmphome,
+            "USERPROFILE": tmphome,
+            "PY_COLORS": "0",
+        }
 
     def __repr__(self):
         return "<Testdir {!r}>".format(self.tmpdir)
diff --git a/testing/test_pdb.py b/testing/test_pdb.py
@@ -257,7 +257,7 @@ def test_not_called_due_to_quit():
         child.sendeof()
         rest = child.read().decode("utf8")
         assert "Exit: Quitting debugger" in rest
-        assert "= \x1b[31m\x1b[1m1 failed\x1b[0m\x1b[31m in" in rest
+        assert "= 1 failed in" in rest
         assert "def test_1" not in rest
         assert "get rekt" not in rest
         self.flush(child)
@@ -542,7 +542,7 @@ def function_1():
         rest = child.read().decode("utf8")
 
         assert "! _pytest.outcomes.Exit: Quitting debugger !" in rest
-        assert "= \x1b[33mno tests ran\x1b[0m\x1b[33m in" in rest
+        assert "= no tests ran in" in rest
         assert "BdbQuit" not in rest
         assert "UNEXPECTED EXCEPTION" not in rest
 
@@ -761,7 +761,7 @@ def do_continue(self, arg):
             assert "> PDB continue (IO-capturing resumed) >" in rest
         else:
             assert "> PDB continue >" in rest
-        assert "= \x1b[32m\x1b[1m1 passed\x1b[0m\x1b[32m in" in rest
+        assert "= 1 passed in" in rest
 
     def test_pdb_used_outside_test(self, testdir):
         p1 = testdir.makepyfile(
@@ -1081,7 +1081,7 @@ def test_3():
         child.sendline("q")
         child.expect_exact("Exit: Quitting debugger")
         rest = child.read().decode("utf8")
-        assert "= \x1b[32m\x1b[1m2 passed\x1b[0m\x1b[32m in" in rest
+        assert "= 2 passed in" in rest
         assert "reading from stdin while output" not in rest
         # Only printed once - not on stderr.
         assert "Exit: Quitting debugger" not in child.before.decode("utf8")
@@ -1126,7 +1126,7 @@ def test_func_kw(myparam, request, func="func_kw"):
             child.sendline("c")
             child.expect_exact("> PDB continue (IO-capturing resumed) >")
         rest = child.read().decode("utf8")
-        assert "= \x1b[32m\x1b[1m6 passed\x1b[0m\x1b[32m in" in rest
+        assert "= 6 passed in" in rest
         assert "reading from stdin while output" not in rest
         # Only printed once - not on stderr.
         assert "Exit: Quitting debugger" not in child.before.decode("utf8")
@@ -1237,7 +1237,7 @@ def test_inner({fixture}):
 
     TestPDB.flush(child)
     assert child.exitstatus == 0
-    assert "= \x1b[32m\x1b[1m1 passed\x1b[0m\x1b[32m in" in rest
+    assert "= 1 passed in" in rest
     assert "> PDB continue (IO-capturing resumed for fixture %s) >" % (fixture) in rest
 
 
@@ -1376,9 +1376,7 @@ def target():
     child.expect("target_start")
     child.expect(r"\(Pdb")
     child.sendline("evt2.set()")
-    child.expect_exact(
-        "= \x1b[32m\x1b[1m1 passed\x1b[0m\x1b[32m in"
-    )  # main thread exited
+    child.expect_exact("= 1 passed in")  # main thread exited
     child.sendline("c")
     child.expect(r"\(Pdb")
     child.sendline("c")
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
@@ -158,6 +158,8 @@ def test_1():
                 "test2.py": "def test_2(): pass",
             }
         )
+        # Explicitly test colored output.
+        testdir._env_run_update["PY_COLORS"] = "1"
 
         child = testdir.spawn_pytest("-v test1.py test2.py")
         child.expect(r"collecting \.\.\.")

Original file line number	Diff line number	Diff line change
`@@ -158,6 +158,8 @@ def test_1():`
`158`	`158`	`"test2.py": "def test_2(): pass",`
`159`	`159`	`}`
`160`	`160`	`)`
	`161`	`+ # Explicitly test colored output.`
	`162`	`+ testdir._env_run_update["PY_COLORS"] = "1"`
`161`	`163`
`162`	`164`	`child = testdir.spawn_pytest("-v test1.py test2.py")`
`163`	`165`	`child.expect(r"collecting \.\.\.")`