e2e: saving logs as zip archive

Author: yevh-berdnyk

test/appium/support/base_test_report.py

@@ -27,12 +27,11 @@ def get_test_report_file_path(self, test_name):
 
     def save_logs(self, logs: dict):
         logs_paths = {}
-        for log in logs.keys():
-            log_path = os.path.join(self.TEST_REPORT_DIR, log)
-            result = open(log_path, 'wb')
-            result.write(logs[log])
-            result.close()
-            logs_paths[log] = log_path
+        for log_name, log_content in logs.items():
+            log_path = os.path.join(self.TEST_REPORT_DIR, log_name)
+            with open(log_path, "wb") as archive_file:
+                archive_file.write(log_content)
+            logs_paths[log_name] = log_path
         return logs_paths
 
     def save_test(self, test, geth: dict = None, requests_log: dict = None):

test/appium/tests/base_test_case.py

@@ -86,13 +86,8 @@ def get_app_path():
     return app_path
 
 
-def pull_geth(driver):
-    result = driver.pull_file(get_app_path() + 'geth.log')
-    return base64.b64decode(result)
-
-
-def pull_requests_log(driver):
-    result = driver.pull_file(get_app_path() + 'api.log')
+def pull_logs_folder(driver):
+    result = driver.pull_folder(get_app_path())
     return base64.b64decode(result)
 
 
@@ -260,14 +255,13 @@ def teardown_method(self, method):
                 self.print_lt_session_info(self.drivers[driver])
                 self.add_alert_text_to_report(self.drivers[driver])
                 log_names.append(
-                    '%s_geth%s.log' % (test_suite_data.current_test.name, str(self.drivers[driver].number)))
-                log_contents.append(pull_geth(self.drivers[driver]))
-                log_names.append(
-                    '%s_requests%s.log' % (test_suite_data.current_test.name, str(self.drivers[driver].number)))
-                log_contents.append(pull_requests_log(self.drivers[driver]))
+                    '%s_logs_%s.zip' % (test_suite_data.current_test.name, str(self.drivers[driver].number)))
+                log_contents.append(pull_logs_folder(self.drivers[driver]))
             except (WebDriverException, AttributeError, RemoteDisconnected, ProtocolError):
                 pass
             finally:
+                if not log_contents:
+                    test_suite_data.current_test.testruns[-1].error += "/nCan't extract logs!"
                 try:
                     logs = {log_names[i]: log_contents[i] for i in range(len(log_names))}
                     test_suite_data.current_test.logs_paths = github_report.save_logs(logs)
@@ -296,10 +290,11 @@ def teardown_class(cls):
         try:
             for i, driver in cls.drivers.items():
                 if group_setup_failed:
-                    log_contents.append(pull_geth(driver=driver))
-                    log_names.append('%s_geth%s.log' % (cls.__name__, i))
-                    log_contents.append(pull_requests_log(driver=driver))
-                    log_names.append('%s_requests%s.log' % (cls.__name__, i))
+                    try:
+                        log_contents.append(pull_logs_folder(driver=driver))
+                        log_names.append('%s_logs_%s.zip' % (cls.__name__, i))
+                    except (WebDriverException, AttributeError, RemoteDisconnected, ProtocolError):
+                        test_suite_data.current_test.testruns[-1].error += "/nCan't extract logs!"
                     lt_session_status = "failed"
                 else:
                     lt_session_status = "passed"