From 7e5b40d265f1e8b0fa2c2b9c96a4d91ef9571599 Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Wed, 6 Sep 2017 09:58:42 -0700 Subject: [PATCH] Switch to assert=plain; apparently assert=reinterp is no longer supported --- .travis.yml | 2 +- pyqtgraph/tests/test_reload.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0a6cf699..4478f0a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,7 +143,7 @@ script: # Run unit tests - start_test "unit tests"; - PYTHONPATH=. py.test --cov --assert=reinterp pyqtgraph -sv; + PYTHONPATH=. py.test --cov --assert=plain pyqtgraph -sv; check_output "unit tests"; - echo "test script finished. Current directory:" - pwd diff --git a/pyqtgraph/tests/test_reload.py b/pyqtgraph/tests/test_reload.py index 3f2195e2..7ceed546 100644 --- a/pyqtgraph/tests/test_reload.py +++ b/pyqtgraph/tests/test_reload.py @@ -57,7 +57,7 @@ def test_reload(): if oldcfn is None: # Function did not reload; are we using pytest's assertion rewriting? raise Exception("Function did not reload. (This can happen when using py.test" - " with assertion rewriting; use --assert=reinterp or --assert=plain)") + " with assertion rewriting; use --assert=plain for this test.)") assert oldcfn.im_class is v1[0] assert oldcfn.im_func is v1[2].im_func assert oldcfn.im_self is c