Move CalledProcessError pickling test to test_subprocess

Rémi Lapeyre · Rémi Lapeyre · commit 1d12d28ffa2d · 2019-01-17T00:35:40.000+01:00
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
@@ -1415,14 +1415,10 @@ def test_copy_pickle(self):
 
     def test_pickle_overriden_init(self):
         # Issue #27015
-        from subprocess import CalledProcessError
-
         for proto in range(pickle.HIGHEST_PROTOCOL + 1):
-            orig = CalledProcessError(returncode=2, cmd='foo')
+            orig = NaiveException(x='foo')
             exc = pickle.loads(pickle.dumps(orig, proto))
-            self.assertEqual(orig.cmd, exc.cmd)
-            self.assertEqual(orig.returncode, exc.returncode)
-
+            self.assertEqual(orig.x, exc.x)
 
 
 if __name__ == '__main__':
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
@@ -18,6 +18,7 @@
 import threading
 import gc
 import textwrap
+import pickle
 from test.support import FakePath
 
 try:
@@ -1690,6 +1691,14 @@ def test_CalledProcessError_str_non_zero(self):
         error_string = str(err)
         self.assertIn("non-zero exit status 2.", error_string)
 
+    def test_CalledProcessError_picklable(self):
+        # Issue #27015
+        err = subprocess.CalledProcessError(returncode=2, cmd='foo')
+        for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+            new = pickle.loads(pickle.dumps(err, proto))
+            self.assertEqual(err.returncode, new.returncode)
+            self.assertEqual(err.cmd, new.cmd)
+
     def test_preexec(self):
         # DISCLAIMER: Setting environment variables is *not* a good use
         # of a preexec_fn.  This is merely a test.
