Fixed #32994 -- Fixed autoreloader tests when using 'python -m'.

This commit is contained in:
Jonny Park 2021-08-16 01:10:36 +09:00 committed by Mariusz Felisiak
parent 36714be874
commit 4e8121e8e4
2 changed files with 7 additions and 1 deletions

View File

@ -487,6 +487,7 @@ answer newbie questions, and generally made Django that much better:
Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/> Jonathan Daugherty (cygnus) <http://www.cprogrammer.org/>
Jonathan Feignberg <jdf@pobox.com> Jonathan Feignberg <jdf@pobox.com>
Jonathan Slenders Jonathan Slenders
Jonny Park <jonnythebard9@gmail.com>
Jordan Bae <qoentlr37@gmail.com> Jordan Bae <qoentlr37@gmail.com>
Jordan Dimov <s3x3y1@gmail.com> Jordan Dimov <s3x3y1@gmail.com>
Jordi J. Tablada <jordi.joan@gmail.com> Jordi J. Tablada <jordi.joan@gmail.com>

View File

@ -191,6 +191,7 @@ class TestChildArguments(SimpleTestCase):
[sys.executable, '-m', 'utils_tests.test_module.main_module', 'runserver'], [sys.executable, '-m', 'utils_tests.test_module.main_module', 'runserver'],
) )
@mock.patch('__main__.__spec__', None)
@mock.patch('sys.argv', [__file__, 'runserver']) @mock.patch('sys.argv', [__file__, 'runserver'])
@mock.patch('sys.warnoptions', ['error']) @mock.patch('sys.warnoptions', ['error'])
def test_warnoptions(self): def test_warnoptions(self):
@ -199,6 +200,7 @@ class TestChildArguments(SimpleTestCase):
[sys.executable, '-Werror', __file__, 'runserver'] [sys.executable, '-Werror', __file__, 'runserver']
) )
@mock.patch('__main__.__spec__', None)
@mock.patch('sys.warnoptions', []) @mock.patch('sys.warnoptions', [])
def test_exe_fallback(self): def test_exe_fallback(self):
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
@ -210,6 +212,7 @@ class TestChildArguments(SimpleTestCase):
[exe_path, 'runserver'] [exe_path, 'runserver']
) )
@mock.patch('__main__.__spec__', None)
@mock.patch('sys.warnoptions', []) @mock.patch('sys.warnoptions', [])
def test_entrypoint_fallback(self): def test_entrypoint_fallback(self):
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
@ -221,6 +224,7 @@ class TestChildArguments(SimpleTestCase):
[sys.executable, script_path, 'runserver'] [sys.executable, script_path, 'runserver']
) )
@mock.patch('__main__.__spec__', None)
@mock.patch('sys.argv', ['does-not-exist', 'runserver']) @mock.patch('sys.argv', ['does-not-exist', 'runserver'])
@mock.patch('sys.warnoptions', []) @mock.patch('sys.warnoptions', [])
def test_raises_runtimeerror(self): def test_raises_runtimeerror(self):
@ -475,6 +479,7 @@ class RestartWithReloaderTests(SimpleTestCase):
script.touch() script.touch()
argv = [str(script), 'runserver'] argv = [str(script), 'runserver']
mock_call = self.patch_autoreload(argv) mock_call = self.patch_autoreload(argv)
with mock.patch('__main__.__spec__', None):
autoreload.restart_with_reloader() autoreload.restart_with_reloader()
self.assertEqual(mock_call.call_count, 1) self.assertEqual(mock_call.call_count, 1)
self.assertEqual( self.assertEqual(