From 9335ce7ba935e61c3759d330e0475f46777a780f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 14 Feb 2022 12:21:51 -0800 Subject: [PATCH] removing pytest marks and debugging prints Signed-off-by: Scott Murray --- .../PythonTests/Atom/TestSuite_Main_GPU.py | 28 ------------------- .../Atom/atom_utils/atom_component_helper.py | 5 ++-- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py index 8aec70e3fd..ad2662113b 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/TestSuite_Main_GPU.py @@ -45,30 +45,7 @@ class TestAutomation(EditorTestSuite): return test_screenshots, golden_images - @pytest.mark.test_case_id("C34603773") - @pytest.mark.REQUIRES_gpu - class AtomGPU_BasicLevelSetup_SetsUpLevel_DX12(EditorSingleTest): - from Atom.tests import hydra_AtomGPU_BasicLevelSetup as test_module - - extra_cmdline_args = ["-rhi=dx12"] - - # Custom setup/teardown to remove old screenshots and establish paths to golden images - def setup(self, request, workspace, editor, editor_test_results, launcher_platform): - self.screenshot_directory = os.path.join(workspace.paths.project(), DEFAULT_SUBFOLDER_PATH) - self.screenshot_names = ["AtomBasicLevelSetup.ppm"] - self.test_screenshots, self.golden_images = TestAutomation.screenshot_setup( - screenshot_directory=self.screenshot_directory, - screenshot_names=self.screenshot_names) - - def wrap_run(self, request, workspace, editor, editor_test_results, launcher_platform): - yield - assert compare_screenshot_to_golden_image(self.screenshot_directory, - self.test_screenshots, - self.golden_images, - similarity_threshold=0.96) is True - @pytest.mark.test_case_id("C34525095") - @pytest.mark.REQUIRES_gpu class AtomGPU_LightComponent_AreaLightScreenshotsMatchGoldenImages_DX12(EditorSingleTest): from Atom.tests import hydra_AtomGPU_AreaLightScreenshotTest as test_module @@ -96,7 +73,6 @@ class TestAutomation(EditorTestSuite): similarity_threshold=0.96) is True @pytest.mark.test_case_id("C34525095") - @pytest.mark.REQUIRES_gpu class AtomGPU_LightComponent_AreaLightScreenshotsMatchGoldenImages_Vulkan(EditorSingleTest): from Atom.tests import hydra_AtomGPU_AreaLightScreenshotTest as test_module @@ -124,7 +100,6 @@ class TestAutomation(EditorTestSuite): similarity_threshold=0.96) is True @pytest.mark.test_case_id("C34525110") - @pytest.mark.REQUIRES_gpu class AtomGPU_LightComponent_SpotLightScreenshotsMatchGoldenImages_DX12(EditorSingleTest): from Atom.tests import hydra_AtomGPU_SpotLightScreenshotTest as test_module @@ -141,7 +116,6 @@ class TestAutomation(EditorTestSuite): "SpotLight_5.ppm", "SpotLight_6.ppm", ] - print(self.screenshot_directory) self.test_screenshots, self.golden_images = TestAutomation.screenshot_setup( screenshot_directory=self.screenshot_directory, screenshot_names=self.screenshot_names) @@ -154,7 +128,6 @@ class TestAutomation(EditorTestSuite): similarity_threshold=0.96) is True @pytest.mark.test_case_id("C34525110") - @pytest.mark.REQUIRES_gpu class AtomGPU_LightComponent_SpotLightScreenshotsMatchGoldenImages_Vulkan(EditorSingleTest): from Atom.tests import hydra_AtomGPU_SpotLightScreenshotTest as test_module @@ -171,7 +144,6 @@ class TestAutomation(EditorTestSuite): "SpotLight_5.ppm", "SpotLight_6.ppm", ] - print(self.screenshot_directory) self.test_screenshots, self.golden_images = TestAutomation.screenshot_setup( screenshot_directory=self.screenshot_directory, screenshot_names=self.screenshot_names) diff --git a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py index 83ef9ec3d7..42310ee983 100644 --- a/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py +++ b/AutomatedTesting/Gem/PythonTests/Atom/atom_utils/atom_component_helper.py @@ -86,9 +86,8 @@ def compare_screenshot_similarity( if create_zip_archive: create_screenshots_archive(screenshot_directory) result = ( - f"When comparing the test_screenshot: '{test_screenshot}' " - f"to golden_image: '{golden_image}'.\nThe mean similarity of '{mean_similarity}' " - f"was lower than the similarity threshold of '{similarity_threshold}'. ") + f"When comparing the test_screenshot: '{test_screenshot}' to golden_image: '{golden_image}'.\n" + f"The mean similarity ({mean_similarity}) was lower than the similarity threshold ({similarity_threshold})") return result