From 6d608c2297716ea372b9b742e8485d54fa2909cd Mon Sep 17 00:00:00 2001 From: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com> Date: Wed, 16 Jun 2021 13:36:12 -0700 Subject: [PATCH] {SPEC-6460} BuildReleaseAuxiliaryContent fails to execute (#1341) * Removing Auxiliary tests * removing auxiliary test from running --- .../PythonTests/assetpipeline/CMakeLists.txt | 7 -- .../auxiliary_content_tests/__init__.py | 10 -- .../auxiliary_content_tests.py | 96 ------------------- 3 files changed, 113 deletions(-) delete mode 100755 AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/__init__.py delete mode 100755 AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/auxiliary_content_tests.py diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt index f453a38486..f47d57b7bd 100644 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/assetpipeline/CMakeLists.txt @@ -13,13 +13,6 @@ add_subdirectory(asset_processor_tests) if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ## AP Python Tests ## - ly_add_pytest( - NAME AssetPipelineTests.AuxiliaryContent - PATH ${CMAKE_CURRENT_LIST_DIR}/auxiliary_content_tests/auxiliary_content_tests.py - EXCLUDE_TEST_RUN_TARGET_FROM_IDE - TEST_SUITE periodic - ) - ly_add_pytest( NAME AssetPipelineTests.BankInfoParser PATH ${CMAKE_CURRENT_LIST_DIR}/wwise_bank_dependency_tests/bank_info_parser_tests.py diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/__init__.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/__init__.py deleted file mode 100755 index a6510a297f..0000000000 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -# All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -# its licensors. -# -# For complete copyright and license terms please see the LICENSE at the root of this -# distribution (the "License"). All use of this software is governed by the License, -# or, if provided, by the license below or the license accompanying this file. Do not -# remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/auxiliary_content_tests.py b/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/auxiliary_content_tests.py deleted file mode 100755 index 452dc66352..0000000000 --- a/AutomatedTesting/Gem/PythonTests/assetpipeline/auxiliary_content_tests/auxiliary_content_tests.py +++ /dev/null @@ -1,96 +0,0 @@ -""" -All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -its licensors. - -For complete copyright and license terms please see the LICENSE at the root of this -distribution (the "License"). All use of this software is governed by the License, -or, if provided, by the license below or the license accompanying this file. Do not -remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - -""" -import pytest -import ly_test_tools - -import os -import sys -import shutil -import subprocess -import glob -from ly_test_tools.builtin.helpers import * -from ly_test_tools.environment.process_utils import * -from ly_test_tools.o3de.asset_processor import ASSET_PROCESSOR_PLATFORM_MAP - -logger = logging.getLogger(__name__) - -project_list = ['AutomatedTesting'] - -@pytest.mark.system -@pytest.mark.SUITE_periodic -class TestAuxiliaryContent: - @pytest.fixture(autouse=True) - def setup_teardown(self, request, workspace, project): - path_to_dev = workspace.paths.engine_root() - os.chdir(path_to_dev) - auxiliaryContentDirName = str.lower(project) + f"_{ASSET_PROCESSOR_PLATFORM_MAP[workspace.asset_processor_platform]}_paks" - self.auxiliaryContentPath = os.path.join(path_to_dev, auxiliaryContentDirName) - - def teardown(): - if (os.path.exists(self.auxiliaryContentPath)): - shutil.rmtree(self.auxiliaryContentPath) - - request.addfinalizer(teardown) - - @staticmethod - def scanForLevelPak(path_toscan): - files = glob.glob('{0}/**/level.pak'.format(path_toscan), recursive=True) - return len(files) - - @pytest.mark.parametrize('level', ['alldependencies']) - @pytest.mark.parametrize('project', project_list) - def test_CreateAuxiliaryContent_DontSkipLevelPaks(self, workspace, level): - """ - This test ensure that Auxiliary Content contain level.pak files - - Test Steps: - 1. Run auxiliary content against project under test - 2. Validate auxiliary content exists - 3. Verifies that level.pak exists - """ - - path_to_dev = workspace.paths.engine_root() - bin_path = workspace.paths.build_directory() - - auxiliaryContentScriptPath = os.path.join(path_to_dev, 'BuildReleaseAuxiliaryContent.py') - subprocess.check_call(['python', auxiliaryContentScriptPath, - "--buildFolder={0}".format(bin_path), - "--platforms=pc", - f"--project-path={workspace.project}"]) - - assert os.path.exists(self.auxiliaryContentPath) - assert not self.scanForLevelPak(self.auxiliaryContentPath) == 0 - - @pytest.mark.parametrize('level', ['alldependencies']) - @pytest.mark.parametrize('project', project_list) - def test_CreateAuxiliaryContent_SkipLevelPaks(self, workspace, level): - """ - This test ensure that Auxiliary Content contain no level.pak file - - Test Steps: - 1. Run auxiliary content against project under test with skiplevelPaks flag - 2. Validate auxiliary content exists - 3. Validate level.pak was added to auxiliary content - """ - - path_to_dev = workspace.paths.engine_root() - bin_path = workspace.paths.build_directory() - - auxiliaryContentScriptPath = os.path.join(path_to_dev, 'BuildReleaseAuxiliaryContent.py') - subprocess.check_call(['python', auxiliaryContentScriptPath, - "--buildFolder={0}".format(bin_path), - "--platforms=pc", - "--skiplevelPaks", - f"--project-path={workspace.project}"]) - assert os.path.exists(self.auxiliaryContentPath) - - assert self.scanForLevelPak(self.auxiliaryContentPath) == 0