🐛 Respect wait=False when launching URLs with xdg-open (#1820)

Author: patrick91

tests/test_launch.py

@@ -1,6 +1,6 @@
 import io
 import subprocess
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
 import pytest
 import typer
@@ -52,6 +52,41 @@ def test_launch_url_no_xdg_open():
     mock_webbrowser_open.assert_called_once_with(url)
 
 
+def test_launch_url_linux_xdg_open_does_not_wait_by_default():
+    proc = Mock()
+
+    with (
+        patch("platform.system", return_value="Linux"),
+        patch("shutil.which", return_value=True),
+        patch("subprocess.Popen", return_value=proc) as mock_popen,
+    ):
+        result = typer.launch(url)
+
+    assert result == 0
+    mock_popen.assert_called_once_with(
+        ["xdg-open", url], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT
+    )
+    proc.wait.assert_not_called()
+
+
+def test_launch_url_linux_xdg_open_waits_when_requested():
+    proc = Mock()
+    proc.wait.return_value = 42
+
+    with (
+        patch("platform.system", return_value="Linux"),
+        patch("shutil.which", return_value=True),
+        patch("subprocess.Popen", return_value=proc) as mock_popen,
+    ):
+        result = typer.launch(url, wait=True)
+
+    assert result == 42
+    mock_popen.assert_called_once_with(
+        ["xdg-open", url], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT
+    )
+    proc.wait.assert_called_once_with()
+
+
 @pytest.fixture
 def allow_dev_null(monkeypatch):
     real_open = open

typer/main.py

@@ -1943,7 +1943,6 @@ def launch(
         Doc(
             """
             Wait for the program to exit before returning. This only works if the launched program blocks.
-            In particular, `xdg-open` on Linux does not block.
             """
         ),
     ] = False,
@@ -1995,9 +1994,12 @@ def launch(
         has_xdg_open = _is_linux_or_bsd() and shutil.which("xdg-open") is not None
 
         if has_xdg_open:
-            return subprocess.Popen(
+            process = subprocess.Popen(
                 ["xdg-open", url], stdout=subprocess.DEVNULL, stderr=subprocess.STDOUT
-            ).wait()
+            )
+            if wait:
+                return process.wait()
+            return 0
 
         import webbrowser