Skip to content
Permalink
Browse files

fix expected pytest output for pytest integration after pinning to 3.…

…0.7 (pantsbuild#7240)

### Problem

pantsbuild#7238 attempted to fix an upstream pytest issue (and therefore unbreak our CI) by pinning the default pytest version in our pytest subsystem to `pytest==3.0.7`. This worked, but broke a few of our other tests which relied on specific pytest output, and master is broken now (sorry!).

I also hastily merged pantsbuild#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.

### Solution

- Fix expected pytest output in pytest runner testing.

### Result

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.
  • Loading branch information...
cosmicexplorer committed Feb 13, 2019
1 parent e382541 commit e4456fd16de322a06088f45b19ac3b809c055579
@@ -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 ===========================
@@ -13,10 +13,9 @@
from future.utils import PY2, PY3, text_type

from pants.util.collections_abc_backport import OrderedDict
from pants.util.objects import (EnumVariantSelectionError, Exactly, SubclassesOf,
SuperclassesOf, TypeCheckError, TypeConstraintError,
TypedCollection, TypedDatatypeInstanceConstructionError, datatype,
enum)
from pants.util.objects import (EnumVariantSelectionError, Exactly, SubclassesOf, SuperclassesOf,
TypeCheckError, TypeConstraintError, TypedCollection,
TypedDatatypeInstanceConstructionError, datatype, enum)
from pants_test.test_base import TestBase


@@ -678,7 +677,7 @@ def compare_str(unicode_type_name, include_unicode=False):
WithCollectionTypeConstraint([3, "asdf"])
expected_msg = """\
type check error in class WithCollectionTypeConstraint: errors type checking constructor arguments:
field 'dependencies' was invalid: in wrapped constraint TypedCollection(Exactly(int)) matching iterable object [3, u'asdf']: value u'asdf' (with type 'unicode') must satisfy this type constraint: Exactly(int).""".format(u='u' if PY2 else '', string_type='unicode' if PY2 else 'str')
field 'dependencies' was invalid: in wrapped constraint TypedCollection(Exactly(int)) matching iterable object [3, {u}'asdf']: value {u}'asdf' (with type '{string_type}') must satisfy this type constraint: Exactly(int).""".format(u='u' if PY2 else '', string_type='unicode' if PY2 else 'str')
self.assertEqual(str(cm.exception), expected_msg)

def test_copy(self):

0 comments on commit e4456fd

Please sign in to comment.
You can’t perform that action at this time.