pybuilder-integration 99__tar.gz → 102__tar.gz

{pybuilder-integration-99 → pybuilder_integration-102}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybuilder-integration
-Version: 99
+Version: 102
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 
@@ -10,5 +10,8 @@ Maintainer-email:
 License: Apache 2.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
+Requires-Dist: pytest
+Requires-Dist: tavern==1.25.2
+Requires-Dist: boto3
 
 A pybuilder plugin that runs integration tests against a target.  This is intended to be a broader scope than unit-tests encompassing dependant functionality.

{pybuilder-integration-99 → pybuilder_integration-102}/pybuilder_integration/__init__.py

@@ -25,7 +25,9 @@ def init_plugin(project):
                   f"\t2. Run integration tests found in 'LATEST-{ENVIRONMENT}' managed by ${ARTIFACT_MANAGER}\n"
                   f"\t3. Promote current build integration tests to 'LATEST-{ENVIRONMENT}' (disable with ${PROMOTE_ARTIFACT})\n"
                   f"\t${INTEGRATION_TARGET_URL} - (required) Full URL target for tests\n"
+                  f"\t${INTEGRATION_PUBLIC_TARGET_URL} - (required) Full public URL target for tests\n"
                   f"\t${ENVIRONMENT} - (required) Environment that is being tested (ci/prod)\n"
+                  f"\t${TESTING_SCOPE} - (optional) Will limit scope of tests, default is to the same application - * can be used.\n"
                   f"\t${PROMOTE_ARTIFACT} - Promote integration tests to LATEST-${ENVIRONMENT} (default TRUE)\n"
       )
 def verify_environment(project: Project, logger: Logger, reactor: Reactor):
@@ -34,6 +36,7 @@ def verify_environment(project: Project, logger: Logger, reactor: Reactor):
 
 @task(description="Run integration tests using a cypress spec. Requires NPM installed.\n"
                   f"\t{INTEGRATION_TARGET_URL} - (required) Full URL target for cypress tests\n"
+                  f"\t{INTEGRATION_PUBLIC_TARGET_URL} - (required) Full public URL target for cypress tests\n"
                   f"\t{CYPRESS_TEST_DIR} - directory for test specification (src/integrationtest/cypress)\n"
       )
 def verify_cypress(project: Project, logger: Logger, reactor: Reactor):

{pybuilder-integration-99 → pybuilder_integration-102}/pybuilder_integration/artifact_manager.py

@@ -174,13 +174,22 @@ def extract_application_role(logger, project):
     return app_group, app_name, role
 
 
+def in_scope(scope, filename):
+    if scope == "*": return True
+    return scope in filename
+
+
 def _unzip_downloaded_artifacts(dir_with_zips: str, destination: str, logger: Logger, project:Project) -> str:
+    scope = project.get_property(TESTING_SCOPE,project.get_property(APPLICATION,'*'))
     for file in os.listdir(dir_with_zips):
         # expect {tool}-{self.project.name}.zip
-        if os.path.basename(file).find("tavern") >= 0:
+        filename = os.path.basename(file)
+        if not in_scope(scope, filename):
+            continue
+        if filename.find("tavern") >= 0:
             shutil.unpack_archive(filename=os.path.join(dir_with_zips, file), extract_dir=f"{destination}/tavern",
                                   format="zip")
-        elif os.path.basename(file).find("cypress") >= 0:
+        elif filename.find("cypress") >= 0:
             shutil.unpack_archive(filename=os.path.join(dir_with_zips, file), extract_dir=f"{destination}/cypress",
                                   format="zip")
         else:

{pybuilder-integration-99 → pybuilder_integration-102}/pybuilder_integration/properties.py

@@ -5,6 +5,7 @@ ARTIFACT_MANAGER = "integration_artifact_manager"
 CYPRESS_TEST_DIR = "cypress_test_dir"
 CYPRESS_CONFIG_FILE = "cypress_config_file"
 INTEGRATION_TARGET_URL = "integration_target_url"
+INTEGRATION_PUBLIC_TARGET_URL = "integration_public_target_url"
 TAVERN_ADDITIONAL_ARGS = "tavern_addition_args"
 WORKING_TEST_DIR = "verify_environment_new_test_dir"
 TAVERN_TEST_DIR = "tavern_test_dir"
@@ -16,3 +17,4 @@ APPLICATION = "application"
 APPLICATION_GROUP = "application_group"
 RUN_PARALLEL = "pytest_parallel"
 CONSOLIDATE_TESTS = "consolidate_tavern"
+TESTING_SCOPE = "testing_scope"

{pybuilder-integration-99 → pybuilder_integration-102}/pybuilder_integration/tasks.py

@@ -214,8 +214,10 @@ def _run_tavern_tests_in_dir(test_dir: str, logger: Logger, project: Project, re
     if project.get_property(RUN_PARALLEL, False):
         args.extend(['-n', 'auto'])
     os.environ['TARGET'] = project.get_property(INTEGRATION_TARGET_URL)
+    os.environ['PUBLIC_TARGET'] = project.get_property(INTEGRATION_PUBLIC_TARGET_URL)
     os.environ[ENVIRONMENT] = project.get_property(ENVIRONMENT)
-    logger.info(f"Running against: {project.get_property(INTEGRATION_TARGET_URL)} ")
+    logger.info(f"Running against target: {project.get_property(INTEGRATION_TARGET_URL)} and "
+                f"public target: {project.get_property(INTEGRATION_PUBLIC_TARGET_URL)}")
     cache_wd = os.getcwd()
     try:
         os.chdir(test_dir)

{pybuilder-integration-99 → pybuilder_integration-102}/pybuilder_integration.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybuilder-integration
-Version: 99
+Version: 102
 Summary: A pybuilder plugin that runs integration tests (Tavern & Cypress) against a target.
 Home-page: https://github.com/rspitler/pybuilder-integration
 Author: 
@@ -10,5 +10,8 @@ Maintainer-email:
 License: Apache 2.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
+Requires-Dist: pytest
+Requires-Dist: tavern==1.25.2
+Requires-Dist: boto3
 
 A pybuilder plugin that runs integration tests against a target.  This is intended to be a broader scope than unit-tests encompassing dependant functionality.

{pybuilder-integration-99 → pybuilder_integration-102}/setup.py

@@ -21,7 +21,7 @@ class install(_install):
 if __name__ == '__main__':
     setup(
         name = 'pybuilder-integration',
-        version = '99',
+        version = '102',
         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,