[PATCH 2/2] Fix up the expected output in parse-kickstart_test.py.

Chris Lumens clumens at redhat.com
Tue Jun 2 15:15:46 UTC 2015


This recently changed in dracut, so we need to expect the right thing in
the tests.
---
 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 e44d9d2..c84aa33 100644
--- a/tests/dracut_tests/parse-kickstart_test.py
+++ b/tests/dracut_tests/parse-kickstart_test.py
@@ -136,7 +136,7 @@ class ParseKickstartTestCase(BaseTestCase):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
     def network_test_2(self):
         with tempfile.NamedTemporaryFile() as ks_file:
@@ -154,7 +154,7 @@ network --device=lo --bootproto=static --ip=10.0.2.15 --netmask=255.255.255.0 --
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
             ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-lo").readlines()
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -176,7 +176,7 @@ network --device team0 --activate --bootproto static --ip=10.34.102.222 --netmas
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
             team_lines = open(self.tmpdir+"/ifcfg/ifcfg-team0_slave_0").readlines()
             self.assertEqual(team_lines[0], "# Generated by parse-kickstart\n", team_lines)
@@ -195,7 +195,7 @@ network --device=eth0 --bootproto=dhcp --bondslaves=eth0,eth1
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
             ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-eth0_slave_1").readlines()
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -213,7 +213,7 @@ network --device br0 --activate --bootproto dhcp --bridgeslaves=eth0 --bridgeopt
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
             ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-br0").readlines()
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -243,7 +243,7 @@ network --device=lo --vlanid=171
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=dhcp", lines)
+            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
 
             ifcfg_lines = open(self.tmpdir+"/ifcfg/ifcfg-lo.171").readlines()
             self.assertEqual(ifcfg_lines[1], "BOOTPROTO=dhcp\n", ifcfg_lines)
-- 
2.2.2



More information about the anaconda-patches mailing list