[master 5/5] Don't be too picky about what name is --device=link

dashea installerbot-noreply at redhat.com
Tue Jul 7 18:34:16 UTC 2015


From: David Shea <dshea at redhat.com>

Use regex tests to allow any jumble of characters not containing spaces
or colons to be the first link device. This way the parse-kickstart
tests work on, for example, a VM with a network device named eth0, or my
laptop with the network cable unplugged.
---
 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 2f87fac..36b5e66 100644
--- a/tests/dracut_tests/parse-kickstart_test.py
+++ b/tests/dracut_tests/parse-kickstart_test.py
@@ -139,7 +139,7 @@ def network_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
     def network_test_2(self):
         with tempfile.NamedTemporaryFile(mode="w+t") as ks_file:
@@ -157,7 +157,7 @@ def network_static_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
             ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-lo").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -179,7 +179,7 @@ def network_team_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
             team_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-team0_slave_0").readlines())
             self.assertEqual(team_lines[0], "# Generated by parse-kickstart\n", team_lines)
@@ -198,7 +198,7 @@ def network_bond_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
             ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-eth0_slave_1").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -216,7 +216,7 @@ def network_bridge_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
             ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-br0").readlines())
             self.assertEqual(ifcfg_lines[0], "# Generated by parse-kickstart\n", ifcfg_lines)
@@ -246,7 +246,7 @@ def network_vlanid_test(self):
             ks_file.flush()
             lines = self.execParseKickstart(ks_file.name)
 
-            self.assertEqual(lines[0], "ip=em1:dhcp: bootdev=em1", lines)
+            self.assertRegex(lines[0], r"ip=[^\s:]+:dhcp: bootdev=[^\s:]+", lines)
 
             ifcfg_lines = sorted(open(self.tmpdir+"/ifcfg/ifcfg-lo.171").readlines())
             self.assertEqual(ifcfg_lines[1], "BOOTPROTO=dhcp\n", ifcfg_lines)


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/dddc99bd4832527b1b31be251905c6da70d1025f


More information about the anaconda-patches mailing list