cucu 1.3.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

cucu/cli/core.py

@@ -241,6 +241,8 @@ def run(
 ):
     """
     run a set of feature files
+
+    Note: All the os.environ variables are set to be available in the child processes
     """
     init_global_hook_variables()
     dumper = None
@@ -300,7 +302,9 @@ def run(
         os.environ["CUCU_RECORD_ENV_VARS"] = "true"
 
     os.environ["CUCU_RUN_ID"] = CONFIG["CUCU_RUN_ID"] = generate_short_id()
-    CONFIG["WORKER_RUN_ID"] = "parent"
+    os.environ["WORKER_PARENT_ID"] = CONFIG["WORKER_RUN_ID"] = (
+        generate_short_id()
+    )
     if not dry_run:
         create_run(results, filepath)
 
@@ -494,7 +498,7 @@ def run(
             dumper.stop()
 
         if not dry_run and os.path.exists(results):
-            finish_worker_record()
+            finish_worker_record(worker_run_id=CONFIG.get("WORKER_PARENT_ID"))
             consolidate_database_files(results)
 
         if generate_report:

cucu/db.py

@@ -38,6 +38,7 @@ class cucu_run(BaseModel):
     full_arguments = JSONField()
     date = TextField()
     start_at = DateTimeField()
+    end_at = DateTimeField(null=True)
 
 
 class worker(BaseModel):
@@ -47,6 +48,14 @@ class worker(BaseModel):
         field="cucu_run_id",
         backref="workers",
         column_name="cucu_run_id",
+        null=True,
+    )
+    parent_id = ForeignKeyField(
+        "self",
+        field="worker_run_id",
+        backref="child_workers",
+        column_name="parent_id",
+        null=True,
     )
     start_at = DateTimeField()
     end_at = DateTimeField(null=True)
@@ -114,32 +123,32 @@ class step(BaseModel):
     duration = FloatField(null=True)
     start_at = DateTimeField()
     end_at = DateTimeField(null=True)
-    debug_output = JSONField(null=True)
+    debug_output = TextField(null=True)
     browser_logs = TextField(null=True)
     browser_info = JSONField(null=True)
     screenshots = JSONField(null=True)
 
 
 def record_cucu_run():
-    worker_run_id = CONFIG["WORKER_RUN_ID"]
     cucu_run_id_val = CONFIG["CUCU_RUN_ID"]
-    run_details = {
-        "cucu_run_id": cucu_run_id_val,
-        "worker_run_id": worker_run_id,
-        "full_arguments": sys.argv,
-        "date": datetime.now().isoformat(),
-    }
+    worker_run_id = CONFIG["WORKER_RUN_ID"]
+
     db.connect(reuse_if_open=True)
+    start_at = datetime.now().isoformat()
     cucu_run.create(
         cucu_run_id=cucu_run_id_val,
-        full_arguments=run_details["full_arguments"],
-        date=run_details["date"],
-        start_at=run_details["date"],
+        full_arguments=sys.argv,
+        date=start_at,
+        start_at=start_at,
     )
+
     worker.create(
         worker_run_id=worker_run_id,
         cucu_run_id=cucu_run_id_val,
-        start_at=run_details["date"],
+        parent_id=CONFIG.get("WORKER_PARENT_ID")
+        if CONFIG.get("WORKER_PARENT_ID") != worker_run_id
+        else None,
+        start_at=datetime.now().isoformat(),
     )
     db.close()
     return str(db_filepath)
@@ -266,12 +275,21 @@ def finish_feature_record(feature_obj):
     db.close()
 
 
-def finish_worker_record(custom_data=None):
+def finish_worker_record(custom_data=None, worker_run_id=None):
     db.connect(reuse_if_open=True)
+    target_worker_run_id = worker_run_id or CONFIG["WORKER_RUN_ID"]
     worker.update(
         end_at=datetime.now().isoformat(),
         custom_data=custom_data,
-    ).where(worker.worker_run_id == CONFIG["WORKER_RUN_ID"]).execute()
+    ).where(worker.worker_run_id == target_worker_run_id).execute()
+    db.close()
+
+
+def finish_cucu_run_record():
+    db.connect(reuse_if_open=True)
+    cucu_run.update(
+        end_at=datetime.now().isoformat(),
+    ).where(cucu_run.cucu_run_id == CONFIG["CUCU_RUN_ID"]).execute()
     db.close()
 
 

cucu/environment.py

@@ -11,6 +11,7 @@ from cucu import config, init_scenario_hook_variables, logger
 from cucu.config import CONFIG
 from cucu.db import (
     create_database_file,
+    finish_cucu_run_record,
     finish_feature_record,
     finish_scenario_record,
     finish_step_record,
@@ -58,16 +59,21 @@ def before_all(ctx):
     ctx.check_browser_initialized = partial(check_browser_initialized, ctx)
     ctx.worker_custom_data = {}
 
-    CONFIG["WORKER_RUN_ID"] = generate_short_id()
+    if CONFIG["WORKER_RUN_ID"] != CONFIG["WORKER_PARENT_ID"]:
+        logger.debug(
+            "Create a new worker db since this isn't the parent process"
+        )
+        CONFIG["WORKER_RUN_ID"] = generate_short_id()
+
+        results_path = Path(CONFIG["CUCU_RESULTS_DIR"])
+        worker_run_id = CONFIG["WORKER_RUN_ID"]
+        cucu_run_id = CONFIG["CUCU_RUN_ID"]
+        CONFIG["RUN_DB_PATH"] = run_db_path = (
+            results_path / f"run_{cucu_run_id}_{worker_run_id}.db"
+        )
+        create_database_file(run_db_path)
+        record_cucu_run()
 
-    results_path = Path(CONFIG["CUCU_RESULTS_DIR"])
-    worker_run_id = CONFIG["WORKER_RUN_ID"]
-    cucu_run_id = CONFIG["CUCU_RUN_ID"]
-    CONFIG["RUN_DB_PATH"] = run_db_path = (
-        results_path / f"run_{cucu_run_id}_{worker_run_id}.db"
-    )
-    create_database_file(run_db_path)
-    record_cucu_run()
     CONFIG.snapshot("before_all")
 
     for hook in CONFIG["__CUCU_BEFORE_ALL_HOOKS"]:
@@ -80,6 +86,7 @@ def after_all(ctx):
         hook(ctx)
 
     finish_worker_record(ctx.worker_custom_data)
+    finish_cucu_run_record()
     CONFIG.restore(with_pop=True)
 
 

{cucu-1.3.0.dist-info → cucu-1.3.1.dist-info}/METADATA

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

{cucu-1.3.0.dist-info → cucu-1.3.1.dist-info}/RECORD

@@ -7,16 +7,16 @@ cucu/browser/frames.py,sha256=216ee4cd1267e4f91b31aa2f21e94078258ef93fb6b0e4f0a9
 cucu/browser/selenium.py,sha256=7940b60d9921508662ef4b154da344ff40216a719371ecb1fe908b213ecf37aa,13299
 cucu/browser/selenium_tweaks.py,sha256=a1422159584165b73daac99050932922bf6e5162b1b60641727c92594e98b6d9,879
 cucu/cli/__init__.py,sha256=b975f9c951b59289c9fc835d96b71f320f93b7fe7f712c76f4477c47cbfdd3c0,62
-cucu/cli/core.py,sha256=8f1fea34f956d8513d2d3c541fc6d6f5a31f94a753216e7d5a0ca8cddee8635b,27369
+cucu/cli/core.py,sha256=07b02c622c7f5b9872ade0a9a81bf1eb724aa5b0eaa12349d49802e0b949d41f,27560
 cucu/cli/run.py,sha256=a48ca686bc77c3e74292f87e62a487f4795d08f120301d0cc43347812f91bc56,5935
 cucu/cli/steps.py,sha256=960e62b551ff0bed3fdd17a5597bfd5f6a90507820771bb12c21b01f99756dfe,4210
 cucu/cli/thread_dumper.py,sha256=6775e7612c62771ea9aa3950ef3bbe4ca3086195a4e33f5ce582dd3e471e9a25,1593
 cucu/config.py,sha256=e4013a1ab92ace3361cf3ac1f9e66b20d81eced57b0821ae49d589fb91ad5a19,14939
-cucu/db.py,sha256=699d0e92bcadebcdd0990cdf8135e989e6b1373d55ce82b21904b76180d5e922,11345
+cucu/db.py,sha256=d1aad16458f7aad58bab0639687a43c4d0bb05ee6ca411c3ee8ec36c725009a2,11822
 cucu/edgedriver_autoinstaller/README.md,sha256=b43900588aa045d0a3b7ea17d6762a8a4202fc57e2384336fa97394b955b44ba,84
 cucu/edgedriver_autoinstaller/__init__.py,sha256=7e8eb12493ef71ce57be78bc7a95dfc43a0fc491f9fdbe959368c3f494f07d1b,969
 cucu/edgedriver_autoinstaller/utils.py,sha256=891293c30efb086693027b6dfd00efc6528fc69314e28b71f7939e0fdee485c3,6802
-cucu/environment.py,sha256=3ac4cf35a1e55b6936a16973bdad04f5de3710a9120b34e98ba6f68e4b532f4b,12624
+cucu/environment.py,sha256=e74dd336deff00bd12c14ced8a633878cbcc390dd04927005df9fa2997a6b2e2,12885
 cucu/external/jquery/jquery-3.5.1.min.js,sha256=f7f6a5894f1d19ddad6fa392b2ece2c5e578cbf7da4ea805b6885eb6985b6e3d,89476
 cucu/formatter/__init__.py,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
 cucu/formatter/cucu.py,sha256=8c78ba5bd4934508c3cb48f53ff1cb2e50533ec4ba12f532bea7948ed5acdef3,9291
@@ -87,7 +87,7 @@ cucu/steps/text_steps.py,sha256=263fc61e81de7a637055d50e76a71e840acda7b58cf96323
 cucu/steps/variable_steps.py,sha256=59272d1f7ff17318e28c63d8665c69f9fa02fd220000ab45fffb1a36d81925b9,2966
 cucu/steps/webserver_steps.py,sha256=c169294af71231d8ac90f921e1caa57a95b1d6792f1294d4dad4574263c36f2a,1410
 cucu/utils.py,sha256=a79b12b89cc67409bda959310a384cacbe13f87e54241720f88bf303b7fcb9bb,10939
-cucu-1.3.0.dist-info/WHEEL,sha256=0f7d664a881437bddec71c703c3c2f01fd13581519f95130abcc96e296ef0426,79
-cucu-1.3.0.dist-info/entry_points.txt,sha256=d7559122140cecbb949d0835940a1942836fbc1bd834dd666838104b8763c09a,40
-cucu-1.3.0.dist-info/METADATA,sha256=76471940a734efd0729a171e469254343b09111b9fe97adfd7bae35eaa504773,16705
-cucu-1.3.0.dist-info/RECORD,,
+cucu-1.3.1.dist-info/WHEEL,sha256=76443c98c0efcfdd1191eac5fa1d8223dba1c474dbd47676674a255e7ca48770,79
+cucu-1.3.1.dist-info/entry_points.txt,sha256=d7559122140cecbb949d0835940a1942836fbc1bd834dd666838104b8763c09a,40
+cucu-1.3.1.dist-info/METADATA,sha256=81bebb348418295df9e0b26f7fb79a08c9d8f557c0762ecc1957f25182fc7bca,16705
+cucu-1.3.1.dist-info/RECORD,,

{cucu-1.3.0.dist-info → cucu-1.3.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.11
+Generator: uv 0.8.12
 Root-Is-Purelib: true
 Tag: py3-none-any