fix: match os.PathLike too

Signed-off-by: Henry Schreiner <[email protected]>

pytest_subprocess/types.py

@@ -1,5 +1,6 @@
 import asyncio
 import io
+import os
 from typing import Sequence
 from typing import Union
 
@@ -14,5 +15,5 @@
     Sequence[Union[str, bytes]],
 ]
 BUFFER = Union[io.BytesIO, io.StringIO, asyncio.StreamReader]
-ARGUMENT = Union[str, Any]
+ARGUMENT = Union[str, Any, os.PathLike]
 COMMAND = Union[Sequence[ARGUMENT], str, Command]

pytest_subprocess/utils.py

@@ -1,13 +1,13 @@
+import os
 import threading
 from typing import Any as AnyType
 from typing import Iterator
-from typing import List
 from typing import Optional
 from typing import Sequence
 from typing import Tuple
 from typing import Union
 
-ARGUMENT = Union[str, "Any"]
+ARGUMENT = Union[str, "Any", os.PathLike]
 
 
 class Thread(threading.Thread):
@@ -33,11 +33,12 @@ def __init__(
     ):
         if isinstance(command, str):
             command = tuple(command.split(" "))
-        if isinstance(command, list):
-            command = tuple(command)
-        elif not isinstance(command, tuple):
+        if not isinstance(command, (list, tuple)):
             raise TypeError("Command can be only of type string, list or tuple.")
-        self.command: Tuple[Union[str, Any], ...] = command
+
+        self.command: Tuple[ARGUMENT, ...] = tuple(
+            os.fspath(c) if isinstance(c, os.PathLike) else c for c in command
+        )
 
         for (i, command_elem) in enumerate(self.command):
             if isinstance(command_elem, Any) and isinstance(
@@ -48,24 +49,26 @@ def __init__(
     def __eq__(self, other: AnyType) -> bool:
         if isinstance(other, str):
             other = other.split(" ")
-        elif isinstance(other, tuple):
-            other = list(other)
 
-        if other == list(self.command):
+        norm_command = [
+            os.fspath(c) if isinstance(c, os.PathLike) else c for c in self.command
+        ]
+        norm_other = [os.fspath(c) if isinstance(c, os.PathLike) else c for c in other]
+
+        if norm_other == norm_command:
             # straightforward matching
             return True
 
-        other = list(other)
-        for (i, command_elem) in enumerate(self.command):
+        for (i, command_elem) in enumerate(norm_command):
             if isinstance(command_elem, Any):
                 next_command_elem = self._get_next_command_elem(i)
                 if next_command_elem is None:
-                    if not self._are_thresholds_ok(command_elem, len(other)):
+                    if not self._are_thresholds_ok(command_elem, len(norm_other)):
                         return False
                     return True
                 else:
                     next_matching_elem = self._get_next_matching_elem_index(
-                        other, next_command_elem
+                        norm_other, next_command_elem
                     )
                     if next_matching_elem is None:
                         return False
@@ -75,12 +78,12 @@ def __eq__(self, other: AnyType) -> bool:
                         ):
                             return False
 
-                        other = other[next_matching_elem:]
+                        norm_other = norm_other[next_matching_elem:]
             else:
-                if len(other) == 0 or other.pop(0) != command_elem:
+                if len(norm_other) == 0 or norm_other.pop(0) != command_elem:
                     return False
 
-        return len(other) == 0
+        return len(norm_other) == 0
 
     def __iter__(self) -> Iterator:
         return iter(self.command)
@@ -93,15 +96,15 @@ def _are_thresholds_ok(command_elem: "Any", value: int) -> bool:
             return False
         return True
 
-    def _get_next_command_elem(self, index: int) -> Optional[Union[str, "Any"]]:
+    def _get_next_command_elem(self, index: int) -> Optional[ARGUMENT]:
         try:
             return self.command[index + 1]
         except IndexError:
             return None
 
     @staticmethod
     def _get_next_matching_elem_index(
-        other: List[Union[str, "Any"]], elem: Union[str, "Any"]
+        other: Sequence[ARGUMENT], elem: ARGUMENT
     ) -> Optional[int]:
         return next(
             (i for i, other_elem in enumerate(other) if elem == other_elem), None

tests/test_subprocess.py

@@ -5,6 +5,7 @@
 import subprocess
 import sys
 import time
+from pathlib import Path
 
 import pytest
 
@@ -43,6 +44,16 @@ def test_completedprocess_args(fp, cmd):
     assert isinstance(proc.args, type(cmd))
 
 
+@pytest.mark.parametrize("p1,p2", [(Path, str), (str, Path), (Path, Path)])
+def test_completedprocess_args_path(fp, p1, p2):
+    fp.register([p1("cmd")])
+
+    proc = subprocess.run([p2("cmd")], check=True)
+
+    assert proc.args == [p2("cmd")]
+    assert isinstance(proc.args[0], p2)
+
+
 @pytest.mark.parametrize("cmd", [("cmd"), ["cmd"]])
 def test_called_process_error(fp, cmd):
     fp.register(cmd, returncode=1)