Combine test_CalledProcessError_str tests

Author: Benjy Wiener

Lib/test/test_subprocess.py

@@ -2428,36 +2428,26 @@ def test_run_abort(self):
             p.wait()
         self.assertEqual(-p.returncode, signal.SIGABRT)
 
-    def test_CalledProcessError_str_signal(self):
-        err = subprocess.CalledProcessError(-int(signal.SIGABRT), "fake cmd")
-        error_string = str(err)
-        # We're relying on the repr() of the signal.Signals intenum to provide
-        # the word signal, the signal name and the numeric value.
-        self.assertIn("signal", error_string.lower())
-        # We're not being specific about the signal name as some signals have
-        # multiple names and which name is revealed can vary.
-        self.assertIn("SIG", error_string)
-        self.assertIn(str(signal.SIGABRT), error_string)
-
-    def test_CalledProcessError_str_unknown_signal(self):
-        err = subprocess.CalledProcessError(-9876543, "fake cmd")
-        error_string = str(err)
-        self.assertIn("unknown signal 9876543.", error_string)
-
-    def test_CalledProcessError_str_non_zero(self):
+    def test_CalledProcessError_str(self):
+        # command string
         err = subprocess.CalledProcessError(2, "fake cmd")
-        error_string = str(err)
-        self.assertIn("non-zero exit status 2.", error_string)
+        self.assertEqual(str(err), "Command 'fake cmd' returned non-zero exit status 2.")
 
-    def test_CalledProcessError_str_quote_in_cmd(self):
+        # command string with a single-quote
         err = subprocess.CalledProcessError(2, "fake ' cmd")
-        error_string = str(err)
-        self.assertStartsWith(error_string, 'Command "fake \' cmd" ')
+        self.assertEqual(str(err), 'Command "fake \' cmd" returned non-zero exit status 2.')
 
-    def test_CalledProcessError_str_list_cmd(self):
+        # command list
         err = subprocess.CalledProcessError(2, ["fake", "cmd"])
-        error_string = str(err)
-        self.assertStartsWith(error_string, "Command ['fake', 'cmd'] ")
+        self.assertEqual(str(err), "Command ['fake', 'cmd'] returned non-zero exit status 2.")
+
+        # signal
+        err = subprocess.CalledProcessError(-int(signal.SIGABRT), "fake cmd")
+        self.assertEqual(str(err), f"Command 'fake cmd' died with {signal.SIGABRT!r}.")
+
+        # unknown signal
+        err = subprocess.CalledProcessError(-9876543, "fake cmd")
+        self.assertEqual(str(err), "Command 'fake cmd' died with unknown signal 9876543.")
 
     def test_preexec(self):
         # DISCLAIMER: Setting environment variables is *not* a good use