[PATCH 2/2] Deal with the order of ifcfg files not being guaranteed.

Chris Lumens clumens at redhat.com
Fri Jun 5 19:25:29 UTC 2015


When testing these files, they may not be in the order we expect.  Thus, sort
them before testing their contents.  On some systems this will be a no-op,
but locally (and also on breaker) this makes these tests continue to work.
---
 tests/dracut_tests/parse-kickstart_test.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/dracut_tests/parse-kickstart_test.py b/tests/dracut_tests/parse-kickstart_test.py
index 53eee4d..5d19206 100644
--- a/tests/dracut_tests/parse-kickstart_test.py
+++ b/tests/dracut_tests/parse-kickstart_test.py
@@ -156,7 +156,7 @@ network --device=lo --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --
 
             self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
-            ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-lo").readlines()
+            ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-lo").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[1], "BOOTPROTO=static\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[2], "DEVICE=lo\n", ifcfg_lines)
@@ -178,7 +178,7 @@ network --device team0 --activate --bootproto static --ip=10.34.102.222 --netmas
 
             self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
-            team_lines = open(self.tmpdir+"/ifcfg/ifcfg-team0_slave_0").readlines()
+            team_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-team0_slave_0").readlines())
             self.assertEqual(team_lines[0], "# Generated by parse-kickstart\n", team_lines)
             self.assertEqual(team_lines[1], "DEVICE=p3p1\n", team_lines)
             self.assertEqual(team_lines[2], "DEVICETYPE=TeamPort\n", team_lines)
@@ -197,7 +197,7 @@ network --device=eth0 --bootproto=dhcp --bondslaves=eth0,eth1
 
             self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
-            ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-eth0_slave_1").readlines()
+            ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-eth0_slave_1").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
             self.assertTrue(ifcfg_lines[2].startswith("MASTER="), ifcfg_lines)
             self.assertEqual(ifcfg_lines[3], "NAME=eth0 slave 1\n", ifcfg_lines)
@@ -215,7 +215,7 @@ network --device br0 --activate --bootproto dhcp --bridgeslaves=eth0 --bridgeopt
 
             self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
-            ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-br0").readlines()
+            ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-br0").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[1], "BOOTPROTO=dhcp\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[2], "DELAY=2\n", ifcfg_lines)
@@ -227,7 +227,7 @@ network --device br0 --activate --bootproto dhcp --bridgeslaves=eth0 --bridgeopt
             self.assertEqual(ifcfg_lines[8], "TYPE=Bridge\n", ifcfg_lines)
             self.assertTrue(ifcfg_lines[9].startswith("UUID="), ifcfg_lines)
 
-            bridge_lines = open(self.tmpdir+"/ifcfg/ifcfg-br0_slave_1").readlines()
+            bridge_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-br0_slave_1").readlines())
             self.assertEqual(bridge_lines[0], "# Generated by parse-kickstart\n", bridge_lines)
             self.assertEqual(bridge_lines[1], "BRIDGE=br0\n", bridge_lines)
             self.assertEqual(bridge_lines[3], "NAME=br0 slave 1\n", bridge_lines)
@@ -245,7 +245,7 @@ network --device=lo --vlanid=171
 
             self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
-            ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-lo.171").readlines()
+            ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-lo.171").readlines())
             self.assertEqual(ifcfg_lines[1], "BOOTPROTO=dhcp\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[2], "DEVICE=lo.171\n", ifcfg_lines)
             self.assertEqual(ifcfg_lines[3], "IPV6INIT=yes\n", ifcfg_lines)
-- 
2.2.2



More information about the anaconda-patches mailing list