mirror of
https://github.com/python/cpython.git
synced 2025-08-01 15:43:13 +00:00
fix PYTHONWARNINGS handling to not modify the original env value and improve
its tests
This commit is contained in:
parent
b60ee469cd
commit
cdd98fb463
2 changed files with 18 additions and 10 deletions
|
@ -683,7 +683,8 @@ class EnvironmentVariableTests(BaseTest):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
|
||||
stdout=subprocess.PIPE, env=newenv)
|
||||
self.assertEqual(p.stdout.read(), "['ignore::DeprecationWarning']")
|
||||
self.assertEqual(p.communicate()[0], "['ignore::DeprecationWarning']")
|
||||
self.assertEqual(p.wait(), 0)
|
||||
|
||||
def test_comma_separated_warnings(self):
|
||||
newenv = os.environ.copy()
|
||||
|
@ -692,8 +693,9 @@ class EnvironmentVariableTests(BaseTest):
|
|||
p = subprocess.Popen([sys.executable,
|
||||
"-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
|
||||
stdout=subprocess.PIPE, env=newenv)
|
||||
self.assertEqual(p.stdout.read(),
|
||||
self.assertEqual(p.communicate()[0],
|
||||
"['ignore::DeprecationWarning', 'ignore::UnicodeWarning']")
|
||||
self.assertEqual(p.wait(), 0)
|
||||
|
||||
def test_envvar_and_command_line(self):
|
||||
newenv = os.environ.copy()
|
||||
|
@ -701,8 +703,9 @@ class EnvironmentVariableTests(BaseTest):
|
|||
p = subprocess.Popen([sys.executable, "-W" "ignore::UnicodeWarning",
|
||||
"-c", "import sys; sys.stdout.write(str(sys.warnoptions))"],
|
||||
stdout=subprocess.PIPE, env=newenv)
|
||||
self.assertEqual(p.stdout.read(),
|
||||
self.assertEqual(p.communicate()[0],
|
||||
"['ignore::UnicodeWarning', 'ignore::DeprecationWarning']")
|
||||
self.assertEqual(p.wait(), 0)
|
||||
|
||||
class CEnvironmentVariableTests(EnvironmentVariableTests):
|
||||
module = c_warnings
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue