pybuilder-integration 112__tar.gz → 113__tar.gz

{pybuilder_integration-112 → pybuilder_integration-113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybuilder-integration
-Version: 112
+Version: 113
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 

{pybuilder_integration-112 → pybuilder_integration-113}/pybuilder_integration/tasks.py

@@ -63,6 +63,7 @@ _TAVERN_INSTALL_LOCK = threading.Lock()
 _CYPRESS_TARGET_COPY_LOCK = threading.Lock()
 _DEFAULT_PARALLEL_TAVERN_SUITE_WORKERS = 8
 _DEFAULT_PARALLEL_CYPRESS_SUITE_WORKERS = 4
+_CYPRESS_XVFB_DISPLAY_START = 100
 _CYPRESS_SPEC_SUFFIXES = (
     ".js", ".jsx", ".ts", ".tsx", ".mjs", ".cjs", ".coffee", ".feature",
 )
@@ -1190,6 +1191,10 @@ def _run_cypress_suites_parallel(suite_dirs, logger, project, reactor):
     logger.info(
         f"Running {len(work_items)} cypress shards in parallel (workers={workers})"
     )
+    xvfb_display_numbers = {
+        name: _CYPRESS_XVFB_DISPLAY_START + index
+        for index, (_suite_dir, name, _spec_files) in enumerate(work_items)
+    }
 
     def run_item(work_item):
         suite_dir, name, spec_files = work_item
@@ -1205,6 +1210,7 @@ def _run_cypress_suites_parallel(suite_dirs, logger, project, reactor):
                 spec_files=spec_files,
                 skip_install=True,
                 record=False,
+                xvfb_display_num=xvfb_display_numbers[name],
             )
             return "ran"
         except BuildFailedException:
@@ -1284,7 +1290,8 @@ def _cypress_shard_had_no_matching_specs(project, shard_name):
                 output = log_file.read()
         except OSError:
             continue
-        if re.search(r"no spec files were found|Specs:\s*0 found", output, re.IGNORECASE):
+        plain_output = _ANSI_ESCAPE.sub("", output)
+        if re.search(r"no spec files were found|Specs:\s*0 found", plain_output, re.IGNORECASE):
             return True
     return False
 
@@ -1349,7 +1356,7 @@ def _install_cypress_suite_dependencies(work_dir, logger, project, reactor, suit
 
 
 def _run_cypress_tests_in_directory(work_dir, logger, project, reactor: Reactor, suite_name=None, write_summary=True,
-                                    spec_files=None, skip_install=False, record=None):
+                                    spec_files=None, skip_install=False, record=None, xvfb_display_num=None):
     total_time = Timer.start()
     target_url = project.get_mandatory_property(INTEGRATION_TARGET_URL)
     environment = project.get_mandatory_property(ENVIRONMENT)
@@ -1385,7 +1392,9 @@ def _run_cypress_tests_in_directory(work_dir, logger, project, reactor: Reactor,
     if spec_files:
         args.extend(["--spec", ",".join(spec_files)])
     _add_config_file(logger, project, args, environment, work_dir)
-    environment_variables = project.get_property(ENVIRONMENT_VARIABLES, {})
+    environment_variables = dict(project.get_property(ENVIRONMENT_VARIABLES, {}) or {})
+    if xvfb_display_num is not None:
+        environment_variables["XVFB_DISPLAY_NUM"] = str(xvfb_display_num)
     logger.info(f"Running cypress on host: {target_url}")
     log_file_name = f"cypress_run_{suite_name}.log" if suite_name else "cypress_run.log"
     try:

{pybuilder_integration-112 → pybuilder_integration-113}/pybuilder_integration.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybuilder-integration
-Version: 112
+Version: 113
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 

{pybuilder_integration-112 → pybuilder_integration-113}/setup.py

@@ -21,7 +21,7 @@ class install(_install):
 if __name__ == '__main__':
     setup(
         name = 'pybuilder-integration',
-        version = '112',
+        version = '113',
         description = 'A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.',
         long_description = 'A pybuilder plugin that runs integration tests against a target.  This is intended to be a broader scope than unit-tests encompassing dependant functionality.',
         long_description_content_type = None,