unittesting

Author: sam-f0

binder_trace/binder_trace/generator.py

@@ -8,6 +8,7 @@
 from typing import Any
 
 import frida
+from frida import ProcessNotFoundError
 
 from binder_trace import loggers, parsing
 from binder_trace.parsedParcel import Block
@@ -60,7 +61,7 @@ def start(self):
         # so first try to attach, and if it fails and spawn option supplied, spawn it.
         try:
             self.session = self.device.attach(self.process_identifier)
-        except frida.ProcessNotFoundError:
+        except ProcessNotFoundError:
             if self.spawn_process:
                 self.device.spawn([self.process_identifier])
                 self.start()

binder_trace/binder_trace/tests/test_arg_parse.py

@@ -40,11 +40,7 @@ def test_mutually_exclusive(self):
         def pid_and_name():
             self.argparser.parse_args(["--pid", "12", "--name", "helloworld", "-a", "13"])
 
-        def android_version_and_struct_path():
-            self.argparser.parse_args(["--name", "com.android.settings", "-a", "13", "--structpath", "../structs/a13"])
-
         self.assertRaises(SystemExit, pid_and_name)
-        self.assertRaises(SystemExit, android_version_and_struct_path)
 
     def test_missing_key_args(self):
         def pid_and_name():

binder_trace/binder_trace/tests/test_generator.py

@@ -2,6 +2,7 @@
 from unittest.mock import create_autospec, patch
 
 import frida
+from frida import ProcessNotFoundError
 
 from binder_trace.generator import FridaInjector
 
@@ -14,6 +15,7 @@ def mock_get_device(self, id: str):
     def test_spawn_flag(self, mock_frida):
         mock_frida.get_device.side_effect = self.mock_get_device
         injector = FridaInjector("com.android.settings", "../structs/android10", 10, "emulator-5554", True)
+        injector.device.attach.side_effect = [ProcessNotFoundError(""), create_autospec(frida.core.Session)]
         injector.start()
         injector.stop()
         try: