pybuilder-integration 105__tar.gz → 106__tar.gz

{pybuilder_integration-105 → pybuilder_integration-106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybuilder-integration
-Version: 105
+Version: 106
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 
@@ -10,9 +10,10 @@ Maintainer-email:
 License: Apache 2.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
-Requires-Dist: pytest
+Requires-Dist: pytest==7.4.4
 Requires-Dist: tavern==1.25.2
-Requires-Dist: boto3
+Requires-Dist: boto3==1.43.72
+Requires-Dist: defusedxml==0.7.1
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page

{pybuilder_integration-105 → pybuilder_integration-106}/pybuilder_integration/tasks.py

@@ -3,9 +3,10 @@ import os
 import re
 import shutil
 import subprocess
-import sys
 import tempfile
-import xml.etree.ElementTree as ET
+
+from defusedxml import ElementTree as ET
+from defusedxml.common import DefusedXmlException
 
 import pytest
 from pybuilder.core import Project, Logger, RequirementsFile
@@ -27,6 +28,7 @@ from pybuilder_integration.tool_utility import install_cypress
 _VERIFY_ENVIRONMENT_SUBPROCESS_PROPERTIES = [
     INTEGRATION_ARTIFACT_BUCKET,
     ENVIRONMENT,
+    ENVIRONMENT_VARIABLES,
     ARTIFACT_MANAGER,
     CYPRESS_TEST_DIR,
     CYPRESS_CONFIG_FILE,
@@ -134,10 +136,54 @@ def _run_verify_environment_passes_in_subprocesses(project: Project, logger: Log
         if failures:
             raise BuildFailedException("Parallel verify_environment failed: " + "; ".join(failures))
     finally:
+        for _, process, _ in processes:
+            poll = getattr(process, "poll", None)
+            if callable(poll) and poll() is None:
+                process.terminate()
+                process.wait()
+            log_handle = getattr(process, "_pybuilder_integration_log_handle", None)
+            if log_handle and not log_handle.closed:
+                log_handle.close()
+        _merge_parallel_verify_environment_outputs(project, passes)
         if os.path.exists(properties_file):
             os.remove(properties_file)
 
 
+def _merge_parallel_verify_environment_outputs(project: Project, passes):
+    parent_target = project.expand_path("$dir_target")
+    parent_logs_directory = prepare_logs_directory(project)
+    parent_output_directories = [
+        ("logs", parent_logs_directory),
+        ("reports", prepare_reports_directory(project)),
+    ]
+    parent_cypress_log = os.path.join(parent_logs_directory, "cypress_run.log")
+    has_parent_cypress_log = False
+    for pass_config in passes:
+        stage_target = os.path.join(parent_target, "verify_environment", pass_config["name"])
+        for output_directory, destination_directory in parent_output_directories:
+            source = os.path.join(stage_target, output_directory, "integration")
+            if os.path.exists(source):
+                destination = os.path.join(
+                    destination_directory,
+                    "parallel",
+                    pass_config["name"],
+                )
+                shutil.copytree(source, destination, dirs_exist_ok=True)
+                if output_directory == "logs":
+                    cypress_log = os.path.join(source, "cypress_run.log")
+                    if os.path.exists(cypress_log):
+                        _copy_cypress_log(cypress_log, parent_cypress_log, has_parent_cypress_log)
+                        has_parent_cypress_log = True
+
+
+def _copy_cypress_log(source, destination, append):
+    flags = os.O_WRONLY | os.O_CREAT | (os.O_APPEND if append else os.O_TRUNC)
+    mode = "ab" if append else "wb"
+    with open(source, "rb") as source_file:
+        with os.fdopen(os.open(destination, flags, 0o600), mode) as destination_file:
+            shutil.copyfileobj(source_file, destination_file)
+
+
 def _start_verify_environment_subprocess(project: Project, logger: Logger, pass_config, properties_file):
     log_file = os.path.join(prepare_logs_directory(project), f"verify_environment_{pass_config['name']}.log")
     command = _build_verify_environment_subprocess_command(project, pass_config)
@@ -166,9 +212,7 @@ def _start_verify_environment_subprocess(project: Project, logger: Logger, pass_
 def _build_verify_environment_subprocess_command(project: Project, pass_config):
     stage_target = os.path.join(project.expand_path("$dir_target"), "verify_environment", pass_config["name"])
     return [
-        sys.executable,
-        "-c",
-        "from pybuilder.cli import main; main()",
+        "pyb",
         pass_config["task"],
         "-P", f"{WORKING_TEST_DIR}={pass_config['test_dir']}",
         "-P", f"{PARALLEL_VERIFY_ENVIRONMENT}=False",
@@ -191,13 +235,12 @@ def _collect_json_safe_project_properties(project: Project):
     safe_properties = {}
     for name in _VERIFY_ENVIRONMENT_SUBPROCESS_PROPERTIES:
         value = project.get_property(name, None)
-        if value is None:
-            continue
-        try:
-            json.dumps(value)
-        except (TypeError, ValueError):
-            continue
-        safe_properties[name] = value
+        if value is not None:
+            try:
+                json.dumps(value)
+            except (TypeError, ValueError):
+                continue
+            safe_properties[name] = value
     return safe_properties
 
 
@@ -376,7 +419,7 @@ def _build_cypress_summary(log_path):
                     name = tc.get("name", "")
                     msg = (failure.get("message") or failure.text or "").split("\n")[0][:120]
                     failures.append((f"{suite} > {name}", msg))
-        except ET.ParseError:
+        except (ET.ParseError, DefusedXmlException):
             pass
 
     passed = total - failed - skipped

{pybuilder_integration-105 → pybuilder_integration-106}/pybuilder_integration.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybuilder-integration
-Version: 105
+Version: 106
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 
@@ -10,9 +10,10 @@ Maintainer-email:
 License: Apache 2.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
-Requires-Dist: pytest
+Requires-Dist: pytest==7.4.4
 Requires-Dist: tavern==1.25.2
-Requires-Dist: boto3
+Requires-Dist: boto3==1.43.72
+Requires-Dist: defusedxml==0.7.1
 Dynamic: classifier
 Dynamic: description
 Dynamic: home-page

pybuilder_integration-106/pybuilder_integration.egg-info/requires.txt

@@ -0,0 +1,4 @@
+pytest==7.4.4
+tavern==1.25.2
+boto3==1.43.72
+defusedxml==0.7.1

{pybuilder_integration-105 → pybuilder_integration-106}/setup.py

@@ -21,7 +21,7 @@ class install(_install):
 if __name__ == '__main__':
     setup(
         name = 'pybuilder-integration',
-        version = '105',
+        version = '106',
         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,
@@ -49,9 +49,10 @@ if __name__ == '__main__':
         data_files = [],
         package_data = {},
         install_requires = [
-            'pytest',
+            'pytest==7.4.4',
             'tavern==1.25.2',
-            'boto3'
+            'boto3==1.43.72',
+            'defusedxml==0.7.1'
         ],
         extras_require = {},
         dependency_links = [],

pybuilder_integration-105/pybuilder_integration.egg-info/requires.txt

@@ -1,3 +0,0 @@
-pytest
-tavern==1.25.2
-boto3