Merge pull request #747 from amoffat/develop

v2.2.1

Author: amoffat

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2.1 - 1/9/25
+
+- Bugfix where `async` and `return_cmd` does not raise exceptions [#746](https://github.com/amoffat/sh/pull/746)
+
 ## 2.2.0 - 1/9/25
 
 - `return_cmd` with `await` now works correctly [#743](https://github.com/amoffat/sh/issues/743)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sh"
-version = "2.2.0"
+version = "2.2.1"
 description = "Python subprocess replacement"
 authors = ["Andrew Moffat <arwmoffat@gmail.com>"]
 readme = "README.rst"

sh.py

@@ -890,6 +890,9 @@ def __await__(self):
         async def wait_for_completion():
             await self.aio_output_complete.wait()
             if self.call_args["return_cmd"]:
+                # We know the command has completed already,
+                # but need to catch exceptions
+                self.wait()
                 return self
             else:
                 return str(self)

tests/sh_test.py

@@ -1802,6 +1802,19 @@ async def main():
 
         asyncio.run(main())
 
+    def test_async_return_cmd_exc(self):
+        py = create_tmp_test(
+            """
+import sys
+sys.exit(1)
+"""
+        )
+
+        async def main():
+            await python(py.name, _async=True, _return_cmd=True)
+
+        self.assertRaises(sh.ErrorReturnCode_1, asyncio.run, main())
+
     def test_handle_both_out_and_err(self):
         py = create_tmp_test(
             """