Add some more tests for tooling functions

openandroidinstaller/tooling.py

@@ -17,7 +17,6 @@
 from pathlib import Path
 import subprocess
 from subprocess import (
-    Popen,
     PIPE,
     STDOUT,
     CalledProcessError,
@@ -52,7 +51,7 @@ def run_command(
     if enable_logging:
         logger.info(f"Run command: {full_command}")
     # run the command
-    with Popen(
+    with subprocess.Popen(
         full_command,
         stdout=PIPE,
         stderr=STDOUT,
@@ -82,6 +81,7 @@ def logging(*args, **kwargs):
                 if (type(line) == bool) and not line:
                     logger.error(f"{step_desc} Failed!")
                     if return_if_fail:
+                        yield False
                         return
                 yield line
 

pyproject.toml

@@ -24,6 +24,7 @@ py7zr = "^0.20.0"
 pytest-cov = "^4.0.0"
 pytest-mock = "^3.10.0"
 bandit = "^1.7.4"
+pytest-subprocess = "^1.5.0"
 
 [tool.poetry.dev-dependencies]
 

tests/conftest.py

@@ -11,7 +11,9 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
+import os
 import pytest
+import subprocess
 from pathlib import Path
 
 

tests/test_tooling.py

@@ -16,7 +16,42 @@
 from pathlib import Path
 from subprocess import CalledProcessError
 
-from openandroidinstaller.tooling import search_device
+from openandroidinstaller.tooling import adb_reboot, search_device, check_ab_partition
+
+
+def test_adb_reboot_success(fp):
+    """Test if rebooting with adb works fine."""
+
+    with fp.context() as nested_process:
+        nested_process.register(
+            ["test/path/to/tools/adb", "reboot"], stdout=bytes.fromhex("00")
+        )
+        for line in adb_reboot(bin_path=Path("test/path/to/tools")):
+            print(line)
+    for_later = "error: no devices/emulators found"
+    assert line
+
+
+def test_adb_reboot_failure(fp):
+    """Test if a fail in rebooting with adb is handled properly."""
+
+    def callback_function_with_kwargs(process, return_code):
+        process.returncode = return_code
+
+    return_code = 1
+
+    with fp.context() as nested_process:
+        nested_process.register(
+            ["test/path/to/tools/adb", "reboot"],
+            stdout=[
+                bytes("error: no devices/emulators found", encoding="utf-8"),
+            ],
+            callback=callback_function_with_kwargs,
+            callback_kwargs={"return_code": return_code},
+        )
+        for line in adb_reboot(bin_path=Path("test/path/to/tools")):
+            print(line)
+    assert not line
 
 
 def test_search_device_success(mocker):
@@ -57,3 +92,43 @@ def patched_check_output(*args, **kwargs):
     )
 
     assert device_code == None
+
+
+def test_check_ab_device_is_ab(mocker):
+    """Test if checking for ab device works fine."""
+    mocker.patch(
+        "openandroidinstaller.tooling.check_output",
+        return_value=b"[ro.boot.slot_suffix]: [_b]",
+    )
+
+    # test linux
+    is_ab = check_ab_partition(
+        platform="linux", bin_path=Path("openandroidinstaller/bin/")
+    )
+
+    assert is_ab
+
+    # test windows
+    is_ab = check_ab_partition(
+        platform="windows", bin_path=Path("openandroidinstaller/bin/")
+    )
+
+    assert is_ab
+
+
+def test_check_ab_device_not_ab(mocker):
+    """Test if checking for ab device returns False if it fails."""
+
+    def patched_check_output(*args, **kwargs):
+        raise CalledProcessError(returncode=1, cmd="output is None")
+
+    mocker.patch(
+        "openandroidinstaller.tooling.check_output",
+        patched_check_output,
+    )
+
+    is_ab = check_ab_partition(
+        platform="linux", bin_path=Path("openandroidinstaller/bin/")
+    )
+
+    assert not is_ab