cucu 1.3.13__py3-none-any.whl → 1.3.14__py3-none-any.whl

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/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/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()

{cucu-1.3.13.dist-info → cucu-1.3.14.dist-info}/METADATA

@@ -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.dist-info → cucu-1.3.14.dist-info}/RECORD

@@ -7,12 +7,12 @@ cucu/browser/frames.py,sha256=IW7kzRJn5PkbMaovIelAeCWO-T-2sOTwqaYBw-0-LKU,3545
 cucu/browser/selenium.py,sha256=eUC2DZkhUIZi70sVTaNE_0AhanGTceyx_pCLIT7PN6o,13299
 cucu/browser/selenium_tweaks.py,sha256=oUIhWVhBZbc9qsmQUJMpIr9uUWKxtgZBcnySWU6Yttk,879
 cucu/cli/__init__.py,sha256=uXX5yVG1konJ_INdlrcfMg-Tt_5_cSx29Ed8R8v908A,62
-cucu/cli/core.py,sha256=rdnMNvTletzjFeA1JFzc2wF_Hd_YI0KFMe1M0eAvA00,27298
+cucu/cli/core.py,sha256=-3TWxedDNMR1Jg7qNF5GLdvgn7KgthMwQ0hfeyJi1eg,27509
 cucu/cli/run.py,sha256=6w7lkgf3iWsg9lqrmCJEWmOHGRXJFbVyZItVGGk_9gM,6105
 cucu/cli/steps.py,sha256=5-aOGf3fmcnge4pcFM__4shcA3PZwjKe6oZN6XKY1pM,4215
 cucu/cli/thread_dumper.py,sha256=Z3XnYSxidx6pqjlQ7zu-TKMIYZWk4z9c5YLdPkcemiU,1593
 cucu/config.py,sha256=Pi59JiRcCdzugDwraM4R1hXRkP52123z0hSP8X6lyzI,14970
-cucu/db.py,sha256=ofJZQjGw_dBp-WpgG-CjEXOzotagi1n_T_AGL2QRSVY,15082
+cucu/db.py,sha256=ZadBBvwwzlHTi-MXMrHlSudpn61zxaTQsDMfCjSGnNk,15323
 cucu/edgedriver_autoinstaller/README.md,sha256=tDkAWIqgRdCjt-oX1nYqikIC_FfiOEM2-pc5S5VbRLo,84
 cucu/edgedriver_autoinstaller/__init__.py,sha256=fo6xJJPvcc5Xvni8epXfxDoPxJH5_b6Vk2jD9JTwfRs,969
 cucu/edgedriver_autoinstaller/utils.py,sha256=iRKTww77CGaTAntt_QDvxlKPxpMU4otx95OeD97khcM,6802
@@ -86,9 +86,9 @@ cucu/steps/table_steps.py,sha256=Xf_9sMZXJRaO64Sd12vCnBm9Olxq1qyyfHHpy_hveWI,137
 cucu/steps/tables.js,sha256=Os2a7Fo-cg03XVli7USvcnBVad4N7idXr-HBuzdLvVQ,945
 cucu/steps/text_steps.py,sha256=Jj_GHoHeemNwVdUOdqcehArNp7WM-WMjljA4w0pLXuw,2576
 cucu/steps/variable_steps.py,sha256=WSctH3_xcxjijGPYZlxp-foC_SIAAKtF__saNtgZJbk,2966
-cucu/steps/webserver_steps.py,sha256=wWkpSvcSMdiskPkh4cqlepWx1nkvEpTU2tRXQmPDbyo,1410
+cucu/steps/webserver_steps.py,sha256=i11xOmSjhhrQ-2QrDfpjDhWroeJuuGKvbYEsHV1cioI,1406
 cucu/utils.py,sha256=LCcs8sMzvdvH05N8P5QYO4lO6j-_PQC530mEAD96go8,10957
-cucu-1.3.13.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-cucu-1.3.13.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
-cucu-1.3.13.dist-info/METADATA,sha256=-BJsZqK7AOpXZK6eQ6Qlh5psQCo3CmtM3l3R_3zHYvU,16722
-cucu-1.3.13.dist-info/RECORD,,
+cucu-1.3.14.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+cucu-1.3.14.dist-info/entry_points.txt,sha256=11WRIhQM7LuUnQg1lAoZQoNvvBvYNN1maDgQS4djwJo,40
+cucu-1.3.14.dist-info/METADATA,sha256=O06K0LOySNXhSXlxm1DR8pXT9M5bgMTMEwKiGIa5Bj0,16722
+cucu-1.3.14.dist-info/RECORD,,