Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/test_parser_testsuite_timeout into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

BugLink: https://bugs.launchpad.net/bugs/2064586

Test shows this ApparmorTestsuites.test_parser_testsuite test will
take about 40 minutes to run on the newly added Xilinx KD240 device
with J-xilinx kernel.

Bump the timeout to 50 minutes to solve this issue.

[Francis Ginther (fginther)]

+1

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed. Thanks!

diff --git a/ubuntu_qrt_apparmor/control b/ubuntu_qrt_apparmor/control
index 3f2494f..8046e74 100644
--- a/ubuntu_qrt_apparmor/control
+++ b/ubuntu_qrt_apparmor/control
@@ -27,7 +27,10 @@ if result == 'GOOD':
         if all_tests[category]:
             for sub_test in all_tests[category]:
                 test = '{}.{}'.format(category, sub_test)
-                job.run_test_detail(NAME, test_name=test, tag=test, timeout=60*35)
+                timeout_threshold = 60*35
+                if test == 'ApparmorTestsuites.test_parser_testsuite':
+                    timeout_threshold = 60*50  # LP:2064586
+                job.run_test_detail(NAME, test_name=test, tag=test, timeout=timeout_threshold)
 
     # Extra clean up task for Jammy
     job.run_test_detail(NAME, test_name='cleanup', tag='cleanup', timeout=60*5)