Add more tests.

Author: serhiy-storchaka

Lib/test/test_cmd_line_script.py

@@ -820,6 +820,21 @@ def test_filter_syntax_warnings_by_module(self):
             filename)
         self.assertEqual(err.count(b': SyntaxWarning: '), 6)
 
+    def test_zipfile_run_filter_syntax_warnings_by_module(self):
+        filename = support.findfile('test_import/data/syntax_warnings.py')
+        with open(filename, 'rb') as f:
+            source = f.read()
+        with os_helper.temp_dir() as script_dir:
+            zip_name, _ = make_zip_pkg(
+                script_dir, 'test_zip', 'test_pkg', '__main__', source)
+            rc, out, err = assert_python_ok(
+                '-Werror',
+                '-Walways:::__main__',
+                '-Werror:::test_pkg.__main__',
+                os.path.join(zip_name, 'test_pkg')
+            )
+            self.assertEqual(err.count(b': SyntaxWarning: '), 12)
+
 
 def tearDownModule():
     support.reap_children()

Lib/test/test_runpy.py

@@ -20,9 +20,11 @@
     requires_subprocess,
     verbose,
 )
+from test import support
 from test.support.import_helper import forget, make_legacy_pyc, unload
 from test.support.os_helper import create_empty_file, temp_dir, FakePath
 from test.support.script_helper import make_script, make_zip_script
+from test.test_importlib.util import temporary_pycache_prefix
 
 
 import runpy
@@ -763,6 +765,47 @@ def test_encoding(self):
             result = run_path(filename)
             self.assertEqual(result['s'], "non-ASCII: h\xe9")
 
+    def test_run_module_filter_syntax_warnings_by_module(self):
+        module_re = r'test\.test_import\.data\.syntax_warnings\z'
+        with (temp_dir() as tmpdir,
+              temporary_pycache_prefix(tmpdir),
+              warnings.catch_warnings(record=True) as wlog):
+            warnings.simplefilter('error')
+            warnings.filterwarnings('always', module=module_re)
+            warnings.filterwarnings('error', module='syntax_warnings')
+            ns = run_module('test.test_import.data.syntax_warnings')
+        self.assertEqual(sorted(wm.lineno for wm in wlog), [4, 7, 10, 13, 14, 21])
+        filename = ns['__file__']
+        for wm in wlog:
+            self.assertEqual(wm.filename, filename)
+            self.assertIs(wm.category, SyntaxWarning)
+
+    def test_run_path_filter_syntax_warnings_by_module(self):
+        filename = support.findfile('test_import/data/syntax_warnings.py')
+        with warnings.catch_warnings(record=True) as wlog:
+            warnings.simplefilter('error')
+            warnings.filterwarnings('always', module=r'<run_path>\z')
+            warnings.filterwarnings('error', module='test')
+            warnings.filterwarnings('error', module='syntax_warnings')
+            warnings.filterwarnings('error',
+                    module=r'test\.test_import\.data\.syntax_warnings')
+            run_path(filename)
+        self.assertEqual(sorted(wm.lineno for wm in wlog), [4, 7, 10, 13, 14, 21])
+        for wm in wlog:
+            self.assertEqual(wm.filename, filename)
+            self.assertIs(wm.category, SyntaxWarning)
+
+        with warnings.catch_warnings(record=True) as wlog:
+            warnings.simplefilter('error')
+            warnings.filterwarnings('always', module=r'package\.script\z')
+            warnings.filterwarnings('error', module='<run_path>')
+            warnings.filterwarnings('error', module='test')
+            warnings.filterwarnings('error', module='syntax_warnings')
+            warnings.filterwarnings('error',
+                    module=r'test\.test_import\.data\.syntax_warnings')
+            run_path(filename, run_name='package.script')
+        self.assertEqual(sorted(wm.lineno for wm in wlog), [4, 7, 10, 13, 14, 21])
+
 
 @force_not_colorized_test_class
 class TestExit(unittest.TestCase):

Lib/test/test_zipimport_support.py

@@ -13,9 +13,12 @@
 import inspect
 import linecache
 import unittest
+import warnings
+from test import support
 from test.support import os_helper
 from test.support.script_helper import (spawn_python, kill_python, assert_python_ok,
                                         make_script, make_zip_script)
+from test.support import import_helper
 
 verbose = test.support.verbose
 
@@ -236,6 +239,26 @@ def f():
             # bdb/pdb applies normcase to its filename before displaying
             self.assertIn(os.path.normcase(run_name.encode('utf-8')), data)
 
+    def test_import_filter_syntax_warnings_by_module(self):
+        filename = support.findfile('test_import/data/syntax_warnings.py')
+        with (os_helper.temp_dir() as tmpdir,
+              import_helper.DirsOnSysPath()):
+            zip_name, _ = make_zip_script(tmpdir, "test_zip",
+                                          filename, 'test_pkg/test_mod.py')
+            sys.path.insert(0, zip_name)
+            import_helper.unload('test_pkg.test_mod')
+            with warnings.catch_warnings(record=True) as wlog:
+                warnings.simplefilter('error')
+                warnings.filterwarnings('always', module=r'test_pkg\.test_mod\z')
+                warnings.filterwarnings('error', module='test_mod')
+                import test_pkg.test_mod
+            self.assertEqual(sorted(wm.lineno for wm in wlog),
+                             sorted([4, 7, 10, 13, 14, 21]*2))
+            filename = test_pkg.test_mod.__file__
+            for wm in wlog:
+                self.assertEqual(wm.filename, filename)
+                self.assertIs(wm.category, SyntaxWarning)
+
 
 def tearDownModule():
     test.support.reap_children()