Fix cnf var unit test: cnf lines can have different order
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Wed, 24 Oct 2018 13:09:03 +0000 (15:09 +0200)
committerPlamen Dimitrov <pdimitrov@pevogam.com>
Mon, 5 Nov 2018 08:59:00 +0000 (16:59 +0800)
test/test_build_cnfvar.py

index 91fe576..1ea3e76 100755 (executable)
@@ -114,9 +114,12 @@ class BuildCnfVarTest(unittest.TestCase):
                     'FOOBAR_MODE': 'optimize'}
         cnfvar.add_defaults(defaults)
 
-        self.assertEqual('1 FOOBAR,0: "some_data"\n'
-                         '2 (1) FOOBAR_SOMETHING,0: "abc"\n'
-                         '3 (1) FOOBAR_MODE,0: "optimize"\n', str(cnfvar))
+        self.assertTrue('1 FOOBAR,0: "some_data"\n'
+                        '2 (1) FOOBAR_SOMETHING,0: "abc"\n'
+                        '3 (1) FOOBAR_MODE,0: "optimize"\n' == str(cnfvar)
+                     or '1 FOOBAR,0: "some_data"\n'
+                        '2 (1) FOOBAR_MODE,0: "optimize"\n'
+                        '3 (1) FOOBAR_SOMETHING,0: "abc"\n' == str(cnfvar))
 
     def test_mark_as_own_parent(self):
         cnfvar = BuildCnfVar('FOOBAR_SOMETHING', 123, 'some_data', 10)
@@ -138,9 +141,12 @@ class BuildCnfVarTest(unittest.TestCase):
         with open(TEST_CONFIG_FILENAME, 'r') as input:
             read_back = input.read()
 
-            self.assertEqual('1 FOOBAR,0: "some_data"\n'
-                             '2 (1) FOOBAR_SOMETHING,0: "abc"\n'
-                             '3 (1) FOOBAR_MODE,0: "optimize"\n', read_back)
+            self.assertTrue('1 FOOBAR,0: "some_data"\n'
+                            '2 (1) FOOBAR_SOMETHING,0: "abc"\n'
+                            '3 (1) FOOBAR_MODE,0: "optimize"\n' == read_back
+                         or '1 FOOBAR,0: "some_data"\n'
+                            '2 (1) FOOBAR_MODE,0: "optimize"\n'
+                            '3 (1) FOOBAR_SOMETHING,0: "abc"\n' == read_back)
 
         os.unlink(TEST_CONFIG_FILENAME)