From 8ba9d52e3691c089512fa4dc5e2dd503d8419d2a Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Tue, 12 Feb 2019 18:09:35 -0800 Subject: [PATCH] fix expected pytest output for pytest integration after pinning to 3.0.7 (#7240) I also hastily merged #7226, which introduced another test failure, which I have fixed. These are the only failing tests, and these all now pass locally on my laptop. - Fix expected pytest output in pytest runner testing. I think it's still a good idea to string match pytest output unless we suddenly have to change pytest versions drastically like this again. --- .../python/pants_test/rules/test_test_integration.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/python/pants_test/rules/test_test_integration.py b/tests/python/pants_test/rules/test_test_integration.py index 913752de8dc..60127dadf22 100644 --- a/tests/python/pants_test/rules/test_test_integration.py +++ b/tests/python/pants_test/rules/test_test_integration.py @@ -74,7 +74,7 @@ def test_passing_python_test(self): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_pass.py . [100%] +testprojects/tests/python/pants/dummies/test_pass.py . =========================== 1 passed in SOME_TEXT =========================== @@ -94,7 +94,7 @@ def test_failing_python_test(self): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_fail.py F [100%] +testprojects/tests/python/pants/dummies/test_fail.py F =================================== FAILURES =================================== __________________________________ test_fail ___________________________________ @@ -122,7 +122,7 @@ def test_source_dep(self): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_with_source_dep.py . [100%] +testprojects/tests/python/pants/dummies/test_with_source_dep.py . =========================== 1 passed in SOME_TEXT =========================== @@ -141,7 +141,7 @@ def test_thirdparty_dep(self): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_with_thirdparty_dep.py . [100%] +testprojects/tests/python/pants/dummies/test_with_thirdparty_dep.py . =========================== 1 passed in SOME_TEXT =========================== @@ -162,7 +162,7 @@ def test_mixed_python_tests(self): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_fail.py F [100%] +testprojects/tests/python/pants/dummies/test_fail.py F =================================== FAILURES =================================== __________________________________ test_fail ___________________________________ @@ -179,7 +179,7 @@ def test_fail(): plugins: SOME_TEXT collected 1 items -testprojects/tests/python/pants/dummies/test_pass.py . [100%] +testprojects/tests/python/pants/dummies/test_pass.py . =========================== 1 passed in SOME_TEXT ===========================