[3/3] testsuite: Disable test cases that may fail due to unresolved DTB conflicts

Message ID 20260423121941.1704827-3-wzh@ilbers.de
State Under Review
Headers show
Series [1/3] Revert "prefix DTB files with PN in deploy dir" | expand

Commit Message

Zhihang Wei April 23, 2026, 12:19 p.m. UTC
Since the patches resolving DTB deployment conflicts have been reverted,
disable the affected test cases until a proper fix is in place.

Signed-off-by: Zhihang Wei <wzh@ilbers.de>
---
 testsuite/citest.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

MOESSBAUER, Felix April 23, 2026, 12:56 p.m. UTC | #1
On Thu, 2026-04-23 at 14:19 +0200, Zhihang Wei wrote:
> Since the patches resolving DTB deployment conflicts have been reverted,
> disable the affected test cases until a proper fix is in place.

Hi, usually you would apply this commit first before reverting the
change. Otherwise you have commits in the middle that don't pass CI.

But that's a nitpick. Thanks for cleaning this up.

Felix

> 
> Signed-off-by: Zhihang Wei <wzh@ilbers.de>
> ---
>  testsuite/citest.py | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index fc6ec24c..ac45165b 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -697,7 +697,10 @@ class DtbDeployTest(CIBaseTest):
>          ]
>  
>          self.init()
> -        self.perform_build_test(targets, image_install='')
> +        try:
> +            self.perform_build_test(targets, image_install='')
> +        except exceptions.TestFail:
> +            self.cancel('KFAIL')
>  
>      def test_dtb_deploy_images(self):
>          """
> @@ -709,7 +712,10 @@ class DtbDeployTest(CIBaseTest):
>          ]
>  
>          self.init()
> -        self.perform_build_test(targets, image_install='')
> +        try:
> +            self.perform_build_test(targets, image_install='')
> +        except exceptions.TestFail:
> +            self.cancel('KFAIL')
>  
>  
>  class NoCrossTest(CIBaseTest):
> -- 
> 2.39.5
> 
> -- 
> You received this message because you are subscribed to the Google Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260423121941.1704827-3-wzh%40ilbers.de.
Zhihang Wei April 23, 2026, 1:20 p.m. UTC | #2
On 4/23/26 14:56, MOESSBAUER, Felix wrote:
> On Thu, 2026-04-23 at 14:19 +0200, Zhihang Wei wrote:
>> Since the patches resolving DTB deployment conflicts have been reverted,
>> disable the affected test cases until a proper fix is in place.
> Hi, usually you would apply this commit first before reverting the
> change. Otherwise you have commits in the middle that don't pass CI.
>
> But that's a nitpick. Thanks for cleaning this up.
>
> Felix
>
Thanks. There may be other affected tests as well. I'll check on CI and
update together in v2.

Zhihang
>> Signed-off-by: Zhihang Wei <wzh@ilbers.de>
>> ---
>>   testsuite/citest.py | 10 ++++++++--
>>   1 file changed, 8 insertions(+), 2 deletions(-)
>>
>> diff --git a/testsuite/citest.py b/testsuite/citest.py
>> index fc6ec24c..ac45165b 100755
>> --- a/testsuite/citest.py
>> +++ b/testsuite/citest.py
>> @@ -697,7 +697,10 @@ class DtbDeployTest(CIBaseTest):
>>           ]
>>   
>>           self.init()
>> -        self.perform_build_test(targets, image_install='')
>> +        try:
>> +            self.perform_build_test(targets, image_install='')
>> +        except exceptions.TestFail:
>> +            self.cancel('KFAIL')
>>   
>>       def test_dtb_deploy_images(self):
>>           """
>> @@ -709,7 +712,10 @@ class DtbDeployTest(CIBaseTest):
>>           ]
>>   
>>           self.init()
>> -        self.perform_build_test(targets, image_install='')
>> +        try:
>> +            self.perform_build_test(targets, image_install='')
>> +        except exceptions.TestFail:
>> +            self.cancel('KFAIL')
>>   
>>   
>>   class NoCrossTest(CIBaseTest):
>> -- 
>> 2.39.5
>>
>> -- 
>> You received this message because you are subscribed to the Google Groups "isar-users" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
>> To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260423121941.1704827-3-wzh%40ilbers.de.

Patch

diff --git a/testsuite/citest.py b/testsuite/citest.py
index fc6ec24c..ac45165b 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -697,7 +697,10 @@  class DtbDeployTest(CIBaseTest):
         ]
 
         self.init()
-        self.perform_build_test(targets, image_install='')
+        try:
+            self.perform_build_test(targets, image_install='')
+        except exceptions.TestFail:
+            self.cancel('KFAIL')
 
     def test_dtb_deploy_images(self):
         """
@@ -709,7 +712,10 @@  class DtbDeployTest(CIBaseTest):
         ]
 
         self.init()
-        self.perform_build_test(targets, image_install='')
+        try:
+            self.perform_build_test(targets, image_install='')
+        except exceptions.TestFail:
+            self.cancel('KFAIL')
 
 
 class NoCrossTest(CIBaseTest):