cucu 1.3.1__tar.gz → 1.3.3__tar.gz

{cucu-1.3.1 → cucu-1.3.3}/PKG-INFO

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

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

{cucu-1.3.1 → cucu-1.3.3}/src/cucu/cli/core.py

@@ -301,9 +301,13 @@ def run(
     if record_env_vars:
         os.environ["CUCU_RECORD_ENV_VARS"] = "true"
 
-    os.environ["CUCU_RUN_ID"] = CONFIG["CUCU_RUN_ID"] = generate_short_id()
+    cucu_run_id_seed = f"{time.perf_counter()}_{os.getpid()}"
+    os.environ["CUCU_RUN_ID"] = CONFIG["CUCU_RUN_ID"] = generate_short_id(
+        cucu_run_id_seed
+    )
+    worker_id_seed = f"{CONFIG['CUCU_RUN_ID']}_{os.getpid()}"
     os.environ["WORKER_PARENT_ID"] = CONFIG["WORKER_RUN_ID"] = (
-        generate_short_id()
+        generate_short_id(worker_id_seed)
     )
     if not dry_run:
         create_run(results, filepath)

{cucu-1.3.1 → cucu-1.3.3}/src/cucu/environment.py

@@ -1,6 +1,8 @@
 import datetime
 import json
+import os
 import sys
+import time
 import traceback
 from functools import partial
 from pathlib import Path
@@ -63,7 +65,9 @@ def before_all(ctx):
         logger.debug(
             "Create a new worker db since this isn't the parent process"
         )
-        CONFIG["WORKER_RUN_ID"] = generate_short_id()
+        # use seed unique enough for multiple cucu_runs to be combined but predictable within the same run
+        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"]
@@ -71,8 +75,12 @@ def before_all(ctx):
         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()
+        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()
 
     CONFIG.snapshot("before_all")
 
@@ -91,7 +99,8 @@ def after_all(ctx):
 
 
 def before_feature(ctx, feature):
-    feature.feature_run_id = generate_short_id()
+    feature_run_id_seed = f"{CONFIG['WORKER_RUN_ID']}_{time.perf_counter()}"
+    feature.feature_run_id = generate_short_id(feature_run_id_seed)
     feature.custom_data = {}
     record_feature(feature)
 
@@ -163,7 +172,12 @@ def before_scenario(ctx, scenario):
         )
         ctx.browser_log_tee = TeeStream(ctx.browser_log_file)
 
-    CONFIG["SCENARIO_RUN_ID"] = scenario.scenario_run_id = generate_short_id()
+    scenario_run_id_seed = (
+        f"{ctx.feature.feature_run_id}_{time.perf_counter()}"
+    )
+    CONFIG["SCENARIO_RUN_ID"] = scenario.scenario_run_id = generate_short_id(
+        scenario_run_id_seed
+    )
     record_scenario(ctx)
 
     # run before all scenario hooks
@@ -271,7 +285,10 @@ def cleanup_browsers(ctx):
 
 
 def before_step(ctx, step):
-    step.step_run_id = generate_short_id()
+    step_run_id_seed = f"{ctx.scenario.scenario_run_id}_{ctx.step_index}_{time.perf_counter()}"
+    step.step_run_id = generate_short_id(
+        step_run_id_seed, length=10
+    )  # up to 10 characters to give two orders of magnitude less chance of collision
     step.start_at = datetime.datetime.now().isoformat()[:-3]
 
     sys.stdout.captured()

{cucu-1.3.1 → cucu-1.3.3}/src/cucu/utils.py

@@ -43,14 +43,14 @@ class StopRetryException(Exception):
     pass
 
 
-def generate_short_id():
+def generate_short_id(seed=None, length=7):
     """
-    Generate a short 7-character ID based on current performance counter.
-    Used for both cucu_run_id and scenario_run_id.
+    Generate a short 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()[:length]
 
 
 def format_gherkin_table(table, headings=[], prefix=""):