cucu 1.3.0__tar.gz → 1.3.2__tar.gz

{cucu-1.3.0 → cucu-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: cucu
-Version: 1.3.0
+Version: 1.3.2
 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 → cucu-1.3.2}/pyproject.toml

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

{cucu-1.3.0 → cucu-1.3.2}/src/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-1.3.0 → cucu-1.3.2}/src/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-1.3.0 → cucu-1.3.2}/src/cucu/environment.py

@@ -1,5 +1,6 @@
 import datetime
 import json
+import os
 import sys
 import traceback
 from functools import partial
@@ -11,6 +12,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 +60,27 @@ 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"
+        )
+        # use seed unique enough for multiple cucu_runs to be combined
+        worker_id_seed = f"{CONFIG['WORKER_PARENT_ID']}_{os.getpid()}"
+        CONFIG["WORKER_RUN_ID"] = generate_short_id(worker_id_seed)
+
+        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"
+        )
+        if not run_db_path.exists():
+            logger.debug(
+                f"Creating new run database file: {run_db_path} for {worker_id_seed}"
+            )
+            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 +93,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 → cucu-1.3.2}/src/cucu/utils.py

@@ -43,14 +43,14 @@ class StopRetryException(Exception):
     pass
 
 
-def generate_short_id():
+def generate_short_id(seed=None):
     """
-    Generate a short 7-character ID based on current performance counter.
-    Used for both cucu_run_id and scenario_run_id.
+    Generate a short 7-character ID based on seed (defaults to current performance counter).
     """
-    return hashlib.sha256(
-        str(time.perf_counter()).encode("utf-8")
-    ).hexdigest()[:7]
+    if seed is None:
+        seed = time.perf_counter()
+
+    return hashlib.sha256(str(seed).encode("utf-8")).hexdigest()[:7]
 
 
 def format_gherkin_table(table, headings=[], prefix=""):