curtin-dev team mailing list archive

[Michael Hudson-Doyle <mwhudsonlp@xxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/curtin:simplify-dasd-code into curtin:master.

Commit message:
remove unused parameters from dasd code

The functions that parse dasdinfo and dasdview output take parameters strict and rawoutput that are only passed by tests. This removes them and the tests.

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~mwhudson/curtin/+git/curtin/+merge/394033
-- 
Your team curtin developers is requested to review the proposed merge of ~mwhudson/curtin:simplify-dasd-code into curtin:master.

diff --git a/curtin/block/dasd.py b/curtin/block/dasd.py
index b7008f6..daafeb8 100644
--- a/curtin/block/dasd.py
+++ b/curtin/block/dasd.py
@@ -10,7 +10,7 @@ from curtin.log import LOG, logged_time
 Dasdvalue = collections.namedtuple('Dasdvalue', ['hex', 'dec', 'txt'])
 
 
-def dasdinfo(device_id, rawoutput=False, strict=False):
+def dasdinfo(device_id):
     ''' Run dasdinfo command and return the exported values.
 
     :param: device_id:  string, device_id of the dasd device to query.
@@ -30,24 +30,14 @@ def dasdinfo(device_id, rawoutput=False, strict=False):
     '''
     _valid_device_id(device_id)
 
-    try:
-        out, err = util.subp(
-            ['dasdinfo', '--all', '--export',
-             '--busid=%s' % device_id], capture=True)
-    except util.ProcessExecutionError as e:
-        LOG.warning('dasdinfo result may be incomplete: %s', e)
-        if strict:
-            raise
-        out = e.stdout
-        err = e.stderr
-
-    if rawoutput:
-        return (out, err)
+    out, err = util.subp(
+        ['dasdinfo', '--all', '--export', '--busid=%s' % device_id],
+        capture=True)
 
     return util.load_shell_content(out)
 
 
-def dasdview(devname, rawoutput=False):
+def dasdview(devname):
     ''' Run dasdview on devname and return dictionary of data.
 
     dasdview --extended has 3 sections
@@ -59,9 +49,6 @@ def dasdview(devname, rawoutput=False):
 
     out, err = util.subp(['dasdview', '--extended', devname], capture=True)
 
-    if rawoutput:
-        return (out, err)
-
     return _parse_dasdview(out)
 
 
diff --git a/tests/unittests/test_block_dasd.py b/tests/unittests/test_block_dasd.py
index b5e2215..393e288 100644
--- a/tests/unittests/test_block_dasd.py
+++ b/tests/unittests/test_block_dasd.py
@@ -431,18 +431,6 @@ class TestDasdInfo(CiTestCase):
         ID_SERIAL=0x1520
         """)
 
-    info_no_serial = textwrap.dedent("""\
-        ID_BUS=ccw
-        ID_TYPE=disk
-        ID_UID=IBM.750000000DXP71.1500.20
-        ID_XUID=IBM.750000000DXP71.1500.20
-        """)
-
-    info_not_dasd = textwrap.dedent("""\
-        ID_BUS=ccw
-        ID_TYPE=disk
-        """)
-
     def setUp(self):
         super(TestDasdInfo, self).setUp()
         self.add_patch('curtin.block.dasd.util.subp', 'm_subp')
@@ -457,29 +445,8 @@ class TestDasdInfo(CiTestCase):
         expected = util.load_shell_content(self.info)
         self.assertDictEqual(expected, dasd.dasdinfo(device_id))
 
-    def test_info_returns_partial_dictionary(self):
-        """dasdinfo returns partial dictionary on error."""
-        device_id = random_device_id()
-        self.m_subp.side_effect = (
-            util.ProcessExecutionError(stdout=self.info_no_serial,
-                                       stderr=self.random_string(),
-                                       exit_code=random.randint(1, 255),
-                                       cmd=self.random_string()))
-        expected = util.load_shell_content(self.info_no_serial)
-        self.assertDictEqual(expected, dasd.dasdinfo(device_id))
-
-    def test_info_returns_rawoutput(self):
-        """dasdinfo returns stdout, stderr if rawoutput is True."""
-        device_id = random_device_id()
-        expected_stdout = self.random_string()
-        expected_stderr = self.random_string()
-        self.m_subp.return_value = (expected_stdout, expected_stderr)
-        (stdout, stderr) = dasd.dasdinfo(device_id, rawoutput=True)
-        self.assertEqual(expected_stdout, stdout)
-        self.assertEqual(expected_stderr, stderr)
-
-    def test_info_returns_rawoutput_on_partial_discovery(self):
-        """dasdinfo returns stdout, stderr on error if rawoutput is True."""
+    def test_info_raises_on_failure(self):
+        """dasdinfo raises if the process invocation fails."""
         device_id = random_device_id()
         expected_stdout = self.random_string()
         expected_stderr = self.random_string()
@@ -488,20 +455,8 @@ class TestDasdInfo(CiTestCase):
                                        stderr=expected_stderr,
                                        exit_code=random.randint(1, 255),
                                        cmd=self.random_string()))
-        (stdout, stderr) = dasd.dasdinfo(device_id, rawoutput=True)
-        self.assertEqual(expected_stdout, stdout)
-        self.assertEqual(expected_stderr, stderr)
-
-    def test_info_raise_error_if_strict(self):
-        """dasdinfo raises ProcessEdecutionError if strict is True."""
-        device_id = random_device_id()
-        self.m_subp.side_effect = (
-            util.ProcessExecutionError(stdout=self.random_string(),
-                                       stderr=self.random_string(),
-                                       exit_code=random.randint(1, 255),
-                                       cmd=self.random_string()))
         with self.assertRaises(util.ProcessExecutionError):
-            dasd.dasdinfo(device_id, strict=True)
+            dasd.dasdinfo(device_id)
 
 
 class TestDasdView(CiTestCase):
@@ -591,19 +546,6 @@ class TestDasdView(CiTestCase):
             ['dasdview', '--extended', devname], capture=True)
         self.m_parseview.assert_called_with(self.view)
 
-    def test_dasdview_returns_stdout_stderr_on_rawoutput(self):
-        """dasdview returns stdout, stderr if rawoutput is True."""
-        devname = self.random_string()
-        stdout = ''
-        stderr = self.view_nondasd
-        self.m_subp.return_value = (stdout, stderr)
-        (out, err) = dasd.dasdview(devname, rawoutput=True)
-        self.m_subp.assert_called_with(
-            ['dasdview', '--extended', devname], capture=True)
-        self.assertEqual(0, self.m_parseview.call_count)
-        self.assertEqual(stdout, out)
-        self.assertEqual(stderr, err)
-
 
 class TestParseDasdView(CiTestCase):