merge from master

Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/psutil/tests/test_testutils.py b/psutil/tests/test_testutils.py
index e757e017..77e52b69 100755
--- a/psutil/tests/test_testutils.py
+++ b/psutil/tests/test_testutils.py
@@ -406,16 +406,16 @@ class TestMemLeakClass(TestMemoryLeak):
         self.assertEqual(len(ls), times + 1)
 
     def test_execute_w_exc(self):
-        def fun():
+        def fun_1():
             1 / 0
-        self.execute_w_exc(ZeroDivisionError, fun)
+        self.execute_w_exc(ZeroDivisionError, fun_1)
         with self.assertRaises(ZeroDivisionError):
-            self.execute_w_exc(OSError, fun)
+            self.execute_w_exc(OSError, fun_1)
 
-        def fun():
+        def fun_2():
             pass
         with self.assertRaises(AssertionError):
-            self.execute_w_exc(ZeroDivisionError, fun)
+            self.execute_w_exc(ZeroDivisionError, fun_2)
 
 
 class TestTestingUtils(PsutilTestCase):