cucu 1.3.3__tar.gz → 1.3.5__tar.gz

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

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

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

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

@@ -126,12 +126,6 @@ def main():
     is_flag=True,
     help="when set skips are shown",
 )
-@click.option(
-    "--show-status",
-    default=False,
-    is_flag=True,
-    help="when set status output is shown (helpful for CI that wants stdout updates)",
-)
 @click.option(
     "--periodic-thread-dumper",
     default=None,
@@ -233,7 +227,6 @@ def run(
     feature_timeout,
     secrets,
     show_skips,
-    show_status,
     tags,
     selenium_remote_url,
     workers,
@@ -289,9 +282,6 @@ def run(
     if show_skips:
         os.environ["CUCU_SHOW_SKIPS"] = "true"
 
-    if show_status:
-        os.environ["CUCU_SHOW_STATUS"] = "true"
-
     if junit_with_stacktrace:
         os.environ["CUCU_JUNIT_WITH_STACKTRACE"] = "true"
 
@@ -566,7 +556,7 @@ def _add_report_path_in_junit(junit_folder, report_folder):
 
 
 @main.command()
-@click.argument("filepath", default="results")
+@click.argument("results_dir", default="results")
 @click.option(
     "--only-failures",
     default=False,
@@ -585,12 +575,6 @@ def _add_report_path_in_junit(junit_folder, report_folder):
     is_flag=True,
     help="when set skips are shown",
 )
-@click.option(
-    "--show-status",
-    default=False,
-    is_flag=True,
-    help="when set status output is shown (helpful for CI that wants stdout updates)",
-)
 @click.option("-o", "--output", default="report")
 @click.option(
     "-j",
@@ -600,11 +584,10 @@ def _add_report_path_in_junit(junit_folder, report_folder):
     "the same location as --results",
 )
 def report(
-    filepath,
+    results_dir,
     only_failures,
     logging_level,
     show_skips,
-    show_status,
     output,
     junit,
 ):
@@ -619,10 +602,7 @@ def report(
     if show_skips:
         os.environ["CUCU_SHOW_SKIPS"] = "true"
 
-    if show_status:
-        os.environ["CUCU_SHOW_STATUS"] = "true"
-
-    run_details_filepath = os.path.join(filepath, "run_details.json")
+    run_details_filepath = os.path.join(results_dir, "run_details.json")
 
     if os.path.exists(run_details_filepath):
         # load the run details at the time of execution for the provided results
@@ -636,7 +616,7 @@ def report(
         behave_init(run_details["filepath"])
 
     _generate_report(
-        filepath, output, only_failures=only_failures, junit=junit
+        results_dir, output, only_failures=only_failures, junit=junit
     )
 
 

{cucu-1.3.3 → cucu-1.3.5}/src/cucu/db.py

@@ -117,7 +117,7 @@ class step(BaseModel):
     text = TextField(null=True)
     table_data = JSONField(null=True)
     location = TextField()
-    is_substep = BooleanField()
+    is_substep = BooleanField(null=True)  # info available after step ends
     has_substeps = BooleanField()
     status = TextField(null=True)
     duration = FloatField(null=True)
@@ -200,7 +200,6 @@ def start_step_record(ctx, step_obj):
         text=step_obj.text if step_obj.text else None,
         table_data=table if step_obj.table else None,
         location=str(step_obj.location),
-        is_substep=step_obj.is_substep,
         has_substeps=step_obj.has_substeps,
         section_level=getattr(step_obj, "section_level", None),
         start_at=step_obj.start_at,
@@ -227,6 +226,7 @@ def finish_step_record(step_obj, duration):
         parent_seq=step_obj.parent_seq,
         has_substeps=step_obj.has_substeps,
         status=step_obj.status.name,
+        is_substep=step_obj.is_substep,
         duration=duration,
         end_at=step_obj.end_at,
         debug_output=step_obj.debug_output,

{cucu-1.3.3 → cucu-1.3.5}/src/cucu/reporter/html.py

@@ -61,8 +61,6 @@ def generate(results, basepath, only_failures=False):
     generate an HTML report for the results provided.
     """
 
-    show_status = CONFIG["CUCU_SHOW_STATUS"] == "true"
-
     features = []
 
     run_json_filepaths = list(glob.iglob(os.path.join(results, "*run.json")))
@@ -74,11 +72,7 @@ def generate(results, basepath, only_failures=False):
         with open(run_json_filepath, "rb") as index_input:
             try:
                 features += json.loads(index_input.read())
-                if show_status:
-                    print("r", end="", flush=True)
             except Exception as exception:
-                if show_status:
-                    print("")  # add a newline before logger
                 logger.warning(
                     f"unable to read file {run_json_filepath}, got error: {exception}"
                 )
@@ -102,8 +96,6 @@ def generate(results, basepath, only_failures=False):
     reported_features = []
     for feature in features:
         feature["folder_name"] = ellipsize_filename(feature["name"])
-        if show_status:
-            print("F", end="", flush=True)
         scenarios = []
 
         if feature["status"] != "untested" and "elements" in feature:
@@ -158,9 +150,6 @@ def generate(results, basepath, only_failures=False):
             else:
                 logger.info(f"No config to reload: {scenario_configpath}")
 
-            if show_status:
-                print("S", end="", flush=True)
-
             process_tags(scenario)
 
             sub_headers = []
@@ -193,8 +182,6 @@ def generate(results, basepath, only_failures=False):
             step_index = 0
             scenario_started_at = None
             for step in scenario["steps"]:
-                if show_status:
-                    print("s", end="", flush=True)
                 total_steps += 1
                 image_dir = get_step_image_dir(step_index, step["name"])
                 image_dirpath = os.path.join(scenario_filepath, image_dir)
@@ -282,8 +269,6 @@ def generate(results, basepath, only_failures=False):
             if os.path.exists(logs_dir):
                 log_files = []
                 for log_file in glob.iglob(os.path.join(logs_dir, "*.*")):
-                    if show_status:
-                        print("l", end="", flush=True)
                     log_filepath = log_file.removeprefix(
                         f"{scenario_filepath}/"
                     )
@@ -315,9 +300,6 @@ def generate(results, basepath, only_failures=False):
                 for log_file in [
                     x for x in log_files if ".console." in x["name"]
                 ]:
-                    if show_status:
-                        print("c", end="", flush=True)
-
                     log_file_filepath = os.path.join(
                         scenario_filepath, "logs", log_file["name"]
                     )
@@ -362,8 +344,6 @@ def generate(results, basepath, only_failures=False):
 
     package_loader = jinja2.PackageLoader("cucu.reporter", "templates")
     templates = jinja2.Environment(loader=package_loader)  # nosec
-    if show_status:
-        print("")  # add a newline to end status
 
     def urlencode(string):
         """