From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 16 Apr 2016 19:16:05 +0000 (+0300)
Subject: Issue #23029: Fix catch_warnings() in test_filename_none
X-Git-Tag: v2.7.12rc1~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccff2bbd3b3e5376333792b629029ebb69a903d6;p=thirdparty%2FPython%2Fcpython.git

Issue #23029: Fix catch_warnings() in test_filename_none

It was printed UserWarning output because catch_warnings() was missing
record=True.
---

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index 11dc29408ae3..bc7e39847420 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -553,10 +553,13 @@ class _WarningsTests(BaseTest):
         globals_dict = globals()
         oldfile = globals_dict['__file__']
         try:
-            with original_warnings.catch_warnings(module=self.module) as w:
+            with original_warnings.catch_warnings(module=self.module, record=True) as w:
                 self.module.filterwarnings("always", category=UserWarning)
                 globals_dict['__file__'] = None
                 self.module.warn('test', UserWarning)
+            self.assertEqual(len(w), 1)
+            self.assertEqual(w[0].category, UserWarning)
+            self.assertEqual(str(w[0].message), 'test')
         finally:
             globals_dict['__file__'] = oldfile