feat: support for new hunter log format; updated manafa

Author: RRua

anadroid/Anadroid.py

@@ -376,7 +376,7 @@ def get_projs_from_last_run(self):
 
     def get_last_run_file(self):
         run_regex = r"\d+-\d+-\d+-\d+-\d+.*.log"
-        prev_logs = list(filter(lambda t : re.search(run_regex, t), mega_find(get_log_dir(), pattern='*.log', type_file='f', maxdepth=1)))
+        prev_logs = list(filter(lambda t: re.search(run_regex, t), mega_find(get_log_dir(), pattern='*.log', type_file='f', maxdepth=1)))
         if len(prev_logs) == 0:
             return None
         sorted_list = sorted(prev_logs, key=os.path.getmtime)

anadroid/device/DeviceState.py

@@ -213,7 +213,6 @@ def set_screen_brightness(self, value=0):
         res = self.device.execute_command(f"settings put system screen_brightness {value}", shell=True)
         res.validate(("unable to set brightness value of %d " % value))
         self.screen_brightness = value
-        print("olaaa")
 
     def set_screen_always_on_while_plugged(self, value=0):
         """set screen always on state. if state = 1 set stay on value.

anadroid/instrument/JInstInstrumenter.py

@@ -45,7 +45,7 @@ def __update_dependencies_and_plugins(self, instr_type=INSTRUMENTATION_TYPE.TEST
         self.classpath_dependencies = []
         self.build_plugins = []
         if instr_type == INSTRUMENTATION_TYPE.ANNOTATION:
-            self.build_dependencies.append(BuildDependency("io.github.raphael28:hunter-debug-library", version="1.0.1"))
+            self.build_dependencies.append(BuildDependency("io.github.greensoftwarelab:hunter-emanafa-library", version="1.0.1"))
             self.classpath_dependencies.append(
                 BuildDependency("io.github.raphael28:hunter-debug-plugin", dep_type=DependencyType.CLASSPATH,
                                 version="1.0.1"))

anadroid/results_analysis/LogAnalyzer.py

@@ -39,7 +39,7 @@ def analyze_test(self, app, log_file, output_filename=None, **kwargs):
 
     def clean(self):
         super().clean()
-        #self.logcatparser = LogCatParser(log_format="threadtime")
+        self.logcatparser = LogCatParser(log_format="threadtime")
 
     def show_results(self, app_list):
         #for analyzed_app in app_list:

anadroid/results_analysis/ManafaAnalyzer.py

@@ -30,7 +30,7 @@ def analyze_tests(self, app, results_dir=None, **kwargs):
         results_dir = results_dir if results_dir is not None else app.curr_local_dir
         if isinstance(self.profiler.manafa, HunterEManafa):
             hunter_trace = {}
-            output_log_file = "hunter.log"
+            output_log_file = self.profiler.manafa.bts_out_file.replace("bstats", "hunter")
             hunter_logs = [os.path.join(results_dir, f) for f in os.listdir(results_dir) if 'hunter' in f]
             final_hunter = os.path.join(results_dir, output_log_file)
             # concat all hunter logs on final hunter

anadroid/testing_framework/MonkeyFramework.py

@@ -103,9 +103,9 @@ def exec_one_test(self, test_id, device, app, wk_unit, n_retries=1):
         device.unlock_screen()
         time.sleep(1)
         self.profiler.init(**{'app': app})
+        log_file = os.path.join(app.curr_local_dir, f"test_{test_id}.logcat")
         self.profiler.start_profiling()
         app.start()
-        log_file = os.path.join(app.curr_local_dir, f"test_{test_id}.logcat")
         self.execute_test(app.package_name, wk_unit, **{'log_filename': log_file})
         app.stop()
         self.profiler.stop_profiling()

anadroid/testing_framework/work/DroidBotWorkUnit.py

@@ -21,6 +21,7 @@ def execute(self, extras=None, *args, **kwargs):
         cmd = self.command
         if extras:
             cmd = f'{cmd} {extras}'
+
         execute_shell_command(cmd).validate(("Error executing command " + cmd))
 
     def config(self, id=None, **kwargs):

anadroid/testing_framework/work/MonkeyWorkUnit.py

@@ -44,7 +44,7 @@ def __init__(self, bin_cmd):
 
     def execute(self, package_name, *args, **kwargs):
         el_commandant = self.command % package_name
-        print("executing command: " + el_commandant)
+        #print("executing command: " + el_commandant)
         execute_shell_command(el_commandant).validate(("Error executing command " + el_commandant))
 
     def config(self, seed=None, **kwargs):

anadroid/utils/Utils.py

@@ -27,9 +27,10 @@ def getColor(sev):
     }.get(sev, 'green')
 
 
-def log(message, log_sev=LogSeverity.INFO, time=time.time(), to_file=True):
+def log(message, log_sev=LogSeverity.INFO, curr_time=None, to_file=True):
+    curr_time = time.time() if curr_time is None else curr_time
     color = getColor(log_sev.value)
-    adapted_time = re.sub("\s|:", "-", str(datetime.fromtimestamp(time)))
+    adapted_time = re.sub("\s|:", "-", str(datetime.fromtimestamp(curr_time)))
     str_to_print ="[%s] %s: %s" % (log_sev.value, adapted_time, message)
     print(colored(str_to_print, color))
     if to_file:

requirements.txt

@@ -2,7 +2,7 @@ androguard==3.4.0a1
 incremental>=17.5.0
 lxml==4.6.5
 six>=1.15.0
-manafa>=0.3.108
+manafa>=0.3.112
 physalia==0.0.1.dev122
 termcolor==1.1.0
-pylogcatparser==0.2.4
+pylogcatparser>=0.2.6