cucu 1.3.13__tar.gz → 1.3.14__tar.gz

{cucu-1.3.13 → cucu-1.3.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cucu
-Version: 1.3.13
+Version: 1.3.14
 Summary: Easy BDD web testing
 Keywords: cucumber,selenium,behave
 Author: Domino Data Lab, Rodney Gomes, Cedric Young, Xin Dong, Kavya Yakkati, Kevin Garton, Joy Liao

{cucu-1.3.13 → cucu-1.3.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cucu"
-version = "1.3.13"
+version = "1.3.14"
 description = "Easy BDD web testing"
 readme = "README.md"
 license = { text = "The Clear BSD License" }

{cucu-1.3.13 → cucu-1.3.14}/src/cucu/cli/core.py

@@ -524,6 +524,7 @@ def _generate_report(
     report_folder: Path,
     only_failures: False,
     junit_folder: Path | None = None,
+    combine: bool = False,
 ):
     if report_folder.exists():
         shutil.rmtree(report_folder)
@@ -531,7 +532,7 @@ def _generate_report(
     report_folder.mkdir(parents=True, exist_ok=True)
 
     if results_dir.exists():
-        consolidate_database_files(results_dir)
+        consolidate_database_files(results_dir, combine)
 
     report_location = reporter.generate(
         results_dir, report_folder, only_failures=only_failures
@@ -590,6 +591,12 @@ def _generate_report(
     "the same location as --results",
     type=click.Path(path_type=Path),
 )
+@click.option(
+    "--combine",
+    default=False,
+    is_flag=True,
+    help="combine multiple cucu_runs into a single report",
+)
 def report(
     results_dir: Path,
     only_failures,
@@ -597,6 +604,7 @@ def report(
     show_skips,
     output: Path,
     junit: Path,
+    combine: bool,
 ):
     """
     generate a test report from a results directory
@@ -627,6 +635,7 @@ def report(
         report_folder=output,
         only_failures=only_failures,
         junit_folder=junit,
+        combine=combine,
     )
 
 

{cucu-1.3.13 → cucu-1.3.14}/src/cucu/db.py

@@ -411,16 +411,23 @@ def get_first_cucu_run_filepath():
     return run_record.filepath
 
 
-def consolidate_database_files(results_dir):
+def consolidate_database_files(results_dir, combine=False):
     # This function would need a more advanced approach with peewee, so for now, keep using sqlite3 for consolidation
     results_path = Path(results_dir)
     target_db_path = results_path / "run.db"
     if not target_db_path.exists():
         create_database_file(target_db_path)
 
-    db_files = [
-        db for db in results_path.glob("**/run*.db") if db.name != "run.db"
-    ]
+    if not combine:
+        db_files = [
+            db for db in results_path.glob("**/run*.db") if db.name != "run.db"
+        ]
+    else:
+        # include all run.db files in all subdirectories
+        db_files = [
+            db for db in results_path.rglob("run*.db") if db != Path("run.db")
+        ]
+
     tables_to_copy = ["cucu_run", "worker", "feature", "scenario", "step"]
     with sqlite3.connect(target_db_path) as target_conn:
         target_cursor = target_conn.cursor()
@@ -451,7 +458,7 @@ def consolidate_database_files(results_dir):
                     )
                     target_conn.commit()
 
-            if db_file.name != "run.db":
+            if not combine and db_file.name != "run.db":
                 # remove the worker db files
                 db_file.unlink()
 

{cucu-1.3.13 → cucu-1.3.14}/src/cucu/steps/webserver_steps.py

@@ -35,7 +35,7 @@ def run_webserver_for_scenario(ctx, directory, variable):
     CONFIG[variable] = str(port)
 
     with socket.create_connection(("localhost", port), timeout=5):
-        logger.debug(f"Webserver is running at {port=}port")
+        logger.debug(f"Webserver is running at {port=}")
 
     def shutdown_webserver(_):
         httpd.shutdown()