Gitflow 7/16/21 - Atom Sample Viewer (#172)

* Updating .lfsconfig instructions

Signed-off-by: alexpete <[email protected]>

* Enabling Trace::Error and Trace::Assert

Signed-off-by: Scott Murray <[email protected]>

* changing timeouts for suites in python and cmakelists.txt

Signed-off-by: Scott Murray <[email protected]>

Co-authored-by: alexpete <[email protected]>
Co-authored-by: Scott Murray <[email protected]>
Co-authored-by: Alex Peterson <[email protected]>

.lfsconfig

@@ -2,10 +2,14 @@
 # Default LFS endpoint for this repository
 url = https://dwclu450qcnz6.cloudfront.net/api/v1
 
-# To use the endpoint with your fork:
-# 1. uncomment the url line below by removing the '#'
-# 2. replace 'owner' with the username or organization that owns the fork
-# 3. have git ignore your local modification of this file by running
-# git update-index --skip-worktree .lfsconfig
- 
-# url=https://dwclu450qcnz6.cloudfront.net/api/v1/fork/owner
+# To use the endpoint with your fork, run the following git command
+# in your local repository (without the '#'), replacing 'owner' with 
+# the username or organization that owns the fork.
+#
+# git config lfs.url "https://dwclu450qcnz6.cloudfront.net/api/v1/fork/owner"
+#
+# For example, if your fork is https://github.com/octocat/o3de use
+# git config lfs.url "https://dwclu450qcnz6.cloudfront.net/api/v1/fork/octocat"
+#
+# IMPORTANT: authenticate with your GitHub username and personal access token
+# not your GitHub password 

Standalone/PythonTests/Automated/test_AtomSampleViewer_main_suite.py

@@ -47,9 +47,12 @@ class TestAutomationMainSuite:
         # Execute test.
         process_utils.safe_check_call(cmd, stderr=subprocess.STDOUT, encoding='UTF-8', shell=True)
         try:
-            unexpected_lines = ["Script: Screenshot check failed. Diff score"]  # "Diff score" ensures legit failure.
+            unexpected_lines = ["Script: Screenshot check failed. Diff score",  # "Diff score" ensures legit failure.
+                                "Trace::Error",
+                                "Trace::Assert",
+                                "Traceback (most recent call last):"]
             atomsampleviewer_log_monitor.monitor_log_for_lines(
-                unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=200)
+                unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=240)
         except ly_test_tools.log.log_monitor.LogMonitorException as e:
             expected_screenshots_path = os.path.join(
                 workspace.paths.project(), "Scripts", "ExpectedScreenshots")

Standalone/PythonTests/Automated/test_AtomSampleViewer_periodic_suite.py

@@ -47,7 +47,10 @@ class TestAutomationPeriodicSuite:
         # Execute test.
         process_utils.safe_check_call(cmd, stderr=subprocess.STDOUT, encoding='UTF-8', shell=True)
         try:
-            unexpected_lines = ["Script: Screenshot check failed. Diff score"]  # "Diff score" ensures legit failure.
+            unexpected_lines = ["Script: Screenshot check failed. Diff score",  # "Diff score" ensures legit failure.
+                                "Trace::Error",
+                                "Trace::Assert",
+                                "Traceback (most recent call last):"]
             atomsampleviewer_log_monitor.monitor_log_for_lines(
                 unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=600)
         except ly_test_tools.log.log_monitor.LogMonitorException as e:

Standalone/PythonTests/Automated/test_AtomSampleViewer_warp_suite.py

@@ -48,9 +48,12 @@ class TestAutomationWarpSuite:
         # Execute test.
         process_utils.safe_check_call(cmd, stderr=subprocess.STDOUT, encoding='UTF-8', shell=True)
         try:
-            unexpected_lines = ["Script: Screenshot check failed. Diff score"]  # "Diff score" ensures legit failure.
+            unexpected_lines = ["Script: Screenshot check failed. Diff score",  # "Diff score" ensures legit failure.
+                                "Trace::Error",
+                                "Trace::Assert",
+                                "Traceback (most recent call last):"]
             atomsampleviewer_log_monitor.monitor_log_for_lines(
-                unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=200)
+                unexpected_lines=unexpected_lines, halt_on_unexpected=True, timeout=50)
         except ly_test_tools.log.log_monitor.LogMonitorException as e:
             expected_screenshots_path = os.path.join(
                 workspace.paths.project(), "Scripts", "ExpectedScreenshots")

Standalone/PythonTests/CMakeLists.txt

@@ -17,7 +17,7 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED)
         TEST_REQUIRES gpu
         TEST_SUITE main
         TEST_SERIAL
-        TIMEOUT 300
+        TIMEOUT 600
         RUNTIME_DEPENDENCIES
             AssetProcessor
             AssetProcessorBatch