Remove empty logging folders

Author: mdmintz

seleniumbase/behave/behave_sb.py

@@ -940,7 +940,7 @@ def get_configured_sb(context):
     if sb_config.dash_title:
         constants.Dashboard.TITLE = sb_config.dash_title.replace("_", " ")
 
-    log_helper.log_folder_setup(sb.log_path, sb.archive_logs)
+    log_helper.log_folder_setup("latest_logs/", sb.archive_logs)
     download_helper.reset_downloads_folder()
     proxy_helper.remove_proxy_zip_if_present()
     return sb
@@ -1152,10 +1152,9 @@ def _perform_behave_unconfigure_():
             except Exception:
                 pass
         sb_config.shared_driver = None
-    if hasattr(sb_config, "log_path"):
-        log_helper.archive_logs_if_set(
-            sb_config.log_path, sb_config.archive_logs
-        )
+    if hasattr(sb_config, "archive_logs"):
+        log_helper.archive_logs_if_set("latest_logs/", sb_config.archive_logs)
+    log_helper.clear_empty_logs()
     # Dashboard post-processing: Disable time-based refresh and stamp complete
     if not hasattr(sb_config, "dashboard") or not sb_config.dashboard:
         # Done with "behave_unconfigure" unless using the Dashboard

seleniumbase/core/log_helper.py

@@ -563,3 +563,18 @@ def log_folder_setup(log_path, archive_logs=False):
                     pass
                 else:
                     shutil.rmtree(archived_logs)  # (Archive test run later)
+
+
+def clear_empty_logs():
+    latest_logs_dir = os.path.join(os.getcwd(), "latest_logs") + os.sep
+    archived_folder = os.path.join(os.getcwd(), "archived_logs") + os.sep
+    if os.path.exists(latest_logs_dir) and not os.listdir(latest_logs_dir):
+        try:
+            os.rmdir(latest_logs_dir)
+        except OSError:
+            pass
+    if os.path.exists(archived_folder) and not os.listdir(archived_folder):
+        try:
+            os.rmdir(archived_folder)
+        except OSError:
+            pass

seleniumbase/plugins/base_plugin.py

@@ -244,6 +244,7 @@ def finalize(self, result):
         log_helper.archive_logs_if_set(
             self.options.log_path, self.options.archive_logs
         )
+        log_helper.clear_empty_logs()
         if self.report_on:
             if not self.import_error:
                 report_helper.add_bad_page_log_file(self.page_results_list)

seleniumbase/plugins/pytest_plugin.py

@@ -1708,7 +1708,7 @@ def pytest_configure(config):
         from seleniumbase.core import download_helper
         from seleniumbase.core import proxy_helper
 
-        log_helper.log_folder_setup(sb_config.log_path, sb_config.archive_logs)
+        log_helper.log_folder_setup("latest_logs/", sb_config.archive_logs)
         download_helper.reset_downloads_folder()
         proxy_helper.remove_proxy_zip_if_present()
 
@@ -1810,7 +1810,7 @@ def pytest_collection_finish(session):
         from seleniumbase.core import download_helper
         from seleniumbase.core import proxy_helper
 
-        log_helper.log_folder_setup(sb_config.log_path, sb_config.archive_logs)
+        log_helper.log_folder_setup("latest_logs/", sb_config.archive_logs)
         download_helper.reset_downloads_folder()
         proxy_helper.remove_proxy_zip_if_present()
     if sb_config.dashboard and len(session.items) > 0:
@@ -2016,9 +2016,8 @@ def _perform_pytest_unconfigure_():
                 pass
         sb_config.shared_driver = None
     if hasattr(sb_config, "log_path") and sb_config.item_count > 0:
-        log_helper.archive_logs_if_set(
-            sb_config.log_path, sb_config.archive_logs
-        )
+        log_helper.archive_logs_if_set("latest_logs/", sb_config.archive_logs)
+    log_helper.clear_empty_logs()
     # Dashboard post-processing: Disable time-based refresh and stamp complete
     if not hasattr(sb_config, "dashboard") or not sb_config.dashboard:
         # Done with "pytest_unconfigure" unless using the Dashboard

seleniumbase/plugins/sb_manager.py

@@ -115,6 +115,7 @@ def SB(
     interval=None,  # SECONDS (Autoplay interval for SB Slides & Tour steps.)
     time_limit=None,  # SECONDS (Safely fail tests that exceed the time limit.)
 ):
+    import os
     import sys
     import time
     import traceback
@@ -809,7 +810,6 @@ def SB(
     terminal_width = shared_utils.get_terminal_width()
     if test:
         import colorama
-        import os
 
         colorama.init(autoreset=True)
         c1 = colorama.Fore.GREEN
@@ -834,7 +834,8 @@ def SB(
         from seleniumbase.core import download_helper
         from seleniumbase.core import proxy_helper
 
-        log_helper.log_folder_setup(sb_config.log_path)
+        log_helper.log_folder_setup("latest_logs/")
+        log_helper.clear_empty_logs()
         download_helper.reset_downloads_folder()
         if not sb_config.multi_proxy:
             proxy_helper.remove_proxy_zip_if_present()