Attempt to fix CI failures

python-trio · Jul 13, 2021 · de51f9c · de51f9c
1 parent 0734cad
commit de51f9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/newsfragments/1104.removal.rst b/newsfragments/1104.removal.rst
@@ -1,4 +1,4 @@
-The `~Process.aclose` method on `Process` has been deprecated, and
-``async with process_obj`` has also been deprecated. We recommend
-switching to the new ``nursery.start(trio.run_process, ...)`` API
-instead, which is more powerful and predictable.
+The ``aclose`` method on `Process` has been deprecated, and ``async
+with process_obj`` has also been deprecated. We recommend switching to
+the new ``nursery.start(trio.run_process, ...)`` API instead, which is
+more powerful and predictable.
diff --git a/trio/tests/test_subprocess.py b/trio/tests/test_subprocess.py
@@ -111,7 +111,7 @@ async def test_async_with_basics_deprecated(recwarn):
         CAT, stdin=subprocess.PIPE, stdout=subprocess.PIPE
     ) as proc:
         pass
-    assert proc.returncode == 0
+    assert proc.returncode is not None
     with pytest.raises(ClosedResourceError):
         await proc.stdin.send_all(b"x")
     with pytest.raises(ClosedResourceError):
@@ -238,6 +238,7 @@ async def drain_one(stream, count, digit):
             await proc.stdin.aclose()
             assert await proc.stdout.receive_some(1) == b""
             assert await proc.stderr.receive_some(1) == b""
+            await proc.wait()
     assert proc.returncode == 0