From: Christian Herdtweck <christian.herdtweck@intra2net.com>
Date: Wed, 24 Oct 2018 13:09:03 +0000 (+0200)
Subject: Fix cnf var unit test: cnf lines can have different order
X-Git-Tag: v1.3~6
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=fbc2c274a6fc27915ea97257d786e6c587d33616;p=pyi2ncommon

Fix cnf var unit test: cnf lines can have different order
---

diff --git a/test/test_build_cnfvar.py b/test/test_build_cnfvar.py
index 91fe576..1ea3e76 100755
--- a/test/test_build_cnfvar.py
+++ b/test/test_build_cnfvar.py
@@ -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)