]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fix tests.
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 12 Jul 2017 14:31:53 +0000 (17:31 +0300)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 12 Jul 2017 14:31:53 +0000 (17:31 +0300)
Lib/test/test_subprocess.py

index d74d8b30e9c2485a4e6f29f8c719a0e9429500e3..9344d2100185bf1b657de3c5bf5cb3abd44d00a3 100644 (file)
@@ -591,24 +591,24 @@ class ProcessTestCase(BaseTestCase):
     def test_invalid_cmd(self):
         # null character in the command name
         cmd = sys.executable + '\0'
-        with self.assertRaises(ValueError):
+        with self.assertRaises((ValueError, TypeError)):
             subprocess.Popen([cmd, "-c", "pass"])
 
         # null character in the command argument
-        with self.assertRaises(ValueError):
+        with self.assertRaises((ValueError, TypeError)):
             subprocess.Popen([sys.executable, "-c", "pass#\0"])
 
     def test_invalid_env(self):
         # null character in the enviroment variable name
         newenv = os.environ.copy()
         newenv["FRUIT\0VEGETABLE"] = "cabbage"
-        with self.assertRaises(ValueError):
+        with self.assertRaises((ValueError, TypeError)):
             subprocess.Popen([sys.executable, "-c", "pass"], env=newenv)
 
         # null character in the enviroment variable value
         newenv = os.environ.copy()
         newenv["FRUIT"] = "orange\0VEGETABLE=cabbage"
-        with self.assertRaises(ValueError):
+        with self.assertRaises((ValueError, TypeError)):
             subprocess.Popen([sys.executable, "-c", "pass"], env=newenv)
 
         # equal character in the enviroment variable name