diff mbox series

[v2] arm/oeqa: increase optee and ftpm test timeouts

Message ID 20240517175022.48759-1-jon.mason@arm.com
State New
Headers show
Series [v2] arm/oeqa: increase optee and ftpm test timeouts | expand

Commit Message

Jon Mason May 17, 2024, 5:50 p.m. UTC 
OPTEE and ftpm tests are failing in CI on slower systems due to timing
out, but actually finish when given enough time to complete.  Increase
the timeout value to be roughly 100 seconds longer than the time it is
currently taking to finish on the slower systems.

Fixes: d4507866677c ("oeqa runtime: add optee.py test")
Fixes: ba315f7242e0 ("oeqa runtime: add ftpm.py test")
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm/lib/oeqa/runtime/cases/ftpm.py  | 6 +++---
 meta-arm/lib/oeqa/runtime/cases/optee.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Jon Mason May 21, 2024, 2:19 p.m. UTC | #1 
On Fri, 17 May 2024 13:50:22 -0400, Jon Mason wrote:
> OPTEE and ftpm tests are failing in CI on slower systems due to timing
> out, but actually finish when given enough time to complete.  Increase
> the timeout value to be roughly 100 seconds longer than the time it is
> currently taking to finish on the slower systems.
> 
> 

Applied, thanks!

[1/1] arm/oeqa: increase optee and ftpm test timeouts
      commit: b8965bb95ba4e3f80b99ac0d67c7f7a326fbb5de

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/lib/oeqa/runtime/cases/ftpm.py b/meta-arm/lib/oeqa/runtime/cases/ftpm.py
index 1fd3cf882158..be0cf46f5b84 100644
--- a/meta-arm/lib/oeqa/runtime/cases/ftpm.py
+++ b/meta-arm/lib/oeqa/runtime/cases/ftpm.py
@@ -11,12 +11,12 @@  class FtpmTestSuite(OERuntimeTestCase):
     """
     Minimal test for optee-ftpm and ftpm kernel driver interfaces
     """
-    @OETimeout(200)
+    @OETimeout(360)
     def test_ftpm(self):
         # device files, need tee-supplicant fully initialized which takes some time
         # and tests seem to run before boot is complete
-        cmd = "ls -l /dev/tpm0 /dev/tpmrm0 || ( runlevel; sleep 10; ls -l /dev/tpm0 /dev/tpmrm0 )"
-        status, output = self.target.run(cmd, timeout=60)
+        cmd = "ls -l /dev/tpm0 /dev/tpmrm0 || ( runlevel; sleep 60; ls -l /dev/tpm0 /dev/tpmrm0 )"
+        status, output = self.target.run(cmd, timeout=90)
         self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
 
         # tpm version
diff --git a/meta-arm/lib/oeqa/runtime/cases/optee.py b/meta-arm/lib/oeqa/runtime/cases/optee.py
index 0a0bc31ed3d8..4f46225b1d74 100644
--- a/meta-arm/lib/oeqa/runtime/cases/optee.py
+++ b/meta-arm/lib/oeqa/runtime/cases/optee.py
@@ -12,7 +12,7 @@  class OpteeTestSuite(OERuntimeTestCase):
     """
     Run OP-TEE tests (xtest).
     """
-    @OETimeout(800)
+    @OETimeout(1300)
     @OEHasPackage(['optee-test'])
     def test_opteetest_xtest(self):
         # clear storage before executing tests
@@ -20,5 +20,5 @@  class OpteeTestSuite(OERuntimeTestCase):
         status, output = self.target.run(cmd, timeout=60)
         self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
         cmd = "xtest"
-        status, output = self.target.run(cmd, timeout=600)
+        status, output = self.target.run(cmd, timeout=1200)
         self.assertEqual(status, 0, msg='\n'.join([cmd, output]))