summaryrefslogtreecommitdiff
path: root/tests/test_plugins.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-06-03 07:22:39 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-06-03 07:22:39 -0400
commitd328c46442495e7701d3d895e2ddb1da7fa728d8 (patch)
tree2881382daccd65f9054b77bd2e812f7aabfa99de /tests/test_plugins.py
parentce675fdb6da663139bba8c801986ea5801caa893 (diff)
downloadpython-coveragepy-git-d328c46442495e7701d3d895e2ddb1da7fa728d8.tar.gz
Make sure not to call functions with an error set.
Python 3.5 is stricter about getting this right. So we have to call PyErr_Print to print and clear the error before calling the warn function.
Diffstat (limited to 'tests/test_plugins.py')
-rw-r--r--tests/test_plugins.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index 69e7b42b..18edf66f 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -481,7 +481,11 @@ class BadPluginTest(FileTracerTest):
self.assertEqual(errors, 1)
# There should be a warning explaining what's happening, but only one.
- msg = "Disabling plugin %r due to an exception:" % plugin_name
+ # The message can be in two forms:
+ # Disabling plugin '...' due to previous exception
+ # or:
+ # Disabling plugin '...' due to an excepton:
+ msg = "Disabling plugin %r due to " % plugin_name
warnings = stderr.count(msg)
self.assertEqual(warnings, 1)