File relax-test-cluster-conf.patch of Package hawk2

Overview Repositories Revisions Requests Users Attributes Meta

File relax-test-cluster-conf.patch of Package hawk2

commit 03799c476a3735c95bde6544e3624691e985c426
Author: Aleksei Burlakov <aburlakov@suse.com>
Date:   Wed Sep 25 12:40:35 2024 +0200

Test: test_check_cluster_configuration: relax required resource options
    
    Previously we checked that the resource options are exactly as
    in the test. However they might be different in the older versions
    of the pacemaker. In this change we check that the resource options
    are a subset of those in the test.

diff --git a/e2e_test/hawk_test_driver.py b/e2e_test/hawk_test_driver.py
index 63f6fb22..56ad31cf 100644
--- a/e2e_test/hawk_test_driver.py
+++ b/e2e_test/hawk_test_driver.py
@@ -779,17 +779,16 @@ class HawkTestDriver:
             print(f"ERROR: Couldn't find element temp_crm_config[rsc_defaults]")
             return False
         lst = elem.text.split('\n')
+        if not lst:
+            print(f'ERROR: temp_crm_config[rsc_defaults] is empty')
+            return False
         for a in ['migration-threshold']:
             if a not in lst:
                 lst.append(a)
-        lst.sort()
-        lst2 = LongLiterals.RSC_DEFAULT_ATTRIBUTES.split('\n')
-        lst2.sort()
-        if lst != lst2:
-            print(f"ERROR: temp_crm_config[rsc_defaults] has WRONG values.")
-            print(f"       Expected: {lst}")
-            print(f"       Exist:    {lst2}")
-            return False
+        for a in lst:
+            if a not in LongLiterals.RSC_DEFAULT_ATTRIBUTES.split('\n'):
+                print(f'ERROR: temp_crm_config[rsc_defaults] has the WRONG option: {a}')
+                return False
 
         elem = self.find_element(By.NAME, 'temp_crm_config[op_defaults]')
         if not elem:
@@ -859,13 +858,13 @@ class HawkTestDriver:
                 return False
 
             lst = elem.text.split('\n')
-            lst.sort()
-            check_options[1].sort()
-            if lst != check_options[1]:
-                print(f'ERROR: {check_options[0]} has WRONG options.')
-                print(f"       Expected: {lst}")
-                print(f"       Exist: {check_options[1]}")
+            if not lst:
+                print(f'ERROR: crm_config[crm_config][{check_options[0]}] is empty')
                 return False
+            for a in lst:
+                if a not in check_options[1]:
+                    print(f'ERROR: crm_config[crm_config][{check_options[0]}] has the WRONG option: {a}')
+                    return False
         print(f"INFO: Resource options are correct")
 
         time.sleep(self.timeout_scale)

Places

File relax-test-cluster-conf.patch of Package hawk2

Places