From d328c46442495e7701d3d895e2ddb1da7fa728d8 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 3 Jun 2015 07:22:39 -0400 Subject: 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. --- tests/test_plugins.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/test_plugins.py') 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) -- cgit v1.2.1