curtin-dev team mailing list archive

[Dan Bungert <mp+428806@xxxxxxxxxxxxxxxxxx>]

Dan Bungert has proposed merging ~dbungert/curtin:terminology into curtin:master.

Commit message:
nicer terminology for non-API items

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/428806

Skips many possible changes that would require API changes.
-- 
Your team curtin developers is requested to review the proposed merge of ~dbungert/curtin:terminology into curtin:master.

diff --git a/curtin/block/dasd.py b/curtin/block/dasd.py
index 3423601..efb2395 100644
--- a/curtin/block/dasd.py
+++ b/curtin/block/dasd.py
@@ -368,7 +368,7 @@ class DasdDevice(CcwDevice):
         :param layout: string specify disk layout format. Must be one of
             'cdl' (Compatible Disk Layout, default) or
             'ldl' (Linux Disk Layout).
-        :param force: boolean set true to skip sanity checks,
+        :param force: boolean set True to skip checking if mounted,
             defaults to False
         :param set_label: string to write to the volume label for
             identification.  If no label provided, a label is generated from
diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index 647a0bf..141eb76 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -136,7 +136,7 @@ def disable_update_initramfs(cfg, target, machine=None):
                           '--divert', rename, found]
                 in_chroot.subp(divert)
 
-                # create a dummy update-initramfs which just returns true;
+                # create a no-op update-initramfs which just returns true;
                 # this handles postinstall scripts which make invoke $tool
                 # directly
                 util.write_file(target + found,
diff --git a/tests/unittests/test_apt_source.py b/tests/unittests/test_apt_source.py
index 267711f..9551839 100644
--- a/tests/unittests/test_apt_source.py
+++ b/tests/unittests/test_apt_source.py
@@ -600,7 +600,7 @@ Pin-Priority: 50
                     "pin": "release a=unstable",
                     "pin-priority": 50,
                 }, {
-                    "package": "dummy-unwanted-package",
+                    "package": "sample-unwanted-package",
                     "pin": "origin *ubuntu.com*",
                     "pin-priority": -1,
                 }
@@ -612,7 +612,7 @@ Package: *
 Pin: release a=unstable
 Pin-Priority: 50
 
-Package: dummy-unwanted-package
+Package: sample-unwanted-package
 Pin: origin *ubuntu.com*
 Pin-Priority: -1
 """
diff --git a/tests/unittests/test_clear_holders.py b/tests/unittests/test_clear_holders.py
index 48697b5..0cdd979 100644
--- a/tests/unittests/test_clear_holders.py
+++ b/tests/unittests/test_clear_holders.py
@@ -783,7 +783,7 @@ class TestClearHolders(CiTestCase):
     @mock.patch('curtin.block.clear_holders.util')
     def test_shutdown_swap_calls_swapoff(self, mock_util):
         """clear_holders.shutdown_swap() calls swapoff on active swap device"""
-        blockdev = '/mydev/dummydisk'
+        blockdev = '/mydev/sampledisk'
         mock_util.load_file.return_value = textwrap.dedent("""\
             Filename				Type		Size	Used	Priority
             %s        disk		4194300	53508	-1
@@ -794,7 +794,7 @@ class TestClearHolders(CiTestCase):
     @mock.patch('curtin.block.clear_holders.util')
     def test_shutdown_swap_skips_nomatch(self, mock_util):
         """clear_holders.shutdown_swap() ignores unmatched swapdevices"""
-        blockdev = '/mydev/dummydisk'
+        blockdev = '/mydev/sampledisk'
         mock_util.load_file.return_value = textwrap.dedent("""\
             Filename				Type		Size	Used	Priority
             /foobar/wark            disk		4194300	53508	-1
diff --git a/tests/unittests/test_commands_collect_logs.py b/tests/unittests/test_commands_collect_logs.py
index 6418094..2077719 100644
--- a/tests/unittests/test_commands_collect_logs.py
+++ b/tests/unittests/test_commands_collect_logs.py
@@ -234,7 +234,7 @@ class TestCollectLogs(CiTestCase):
 
 
 class TestCreateTar(CiTestCase):
-    """Whitebox testing of create_log_tarfile."""
+    """Open-box testing of create_log_tarfile."""
 
     def setUp(self):
         super(TestCreateTar, self).setUp()
@@ -336,7 +336,7 @@ class TestCreateTar(CiTestCase):
 
 
 class TestWBCollectLogs(CiTestCase):
-    """Whitebox testing of _redact_sensitive_information."""
+    """Open-box testing of _redact_sensitive_information."""
 
     def test_wb_redact_sensitive_information(self):
         """_redact_sensitive_information replaces redact_values in any file."""
diff --git a/tests/unittests/test_curthooks.py b/tests/unittests/test_curthooks.py
index f878d9f..f87c17a 100644
--- a/tests/unittests/test_curthooks.py
+++ b/tests/unittests/test_curthooks.py
@@ -107,7 +107,7 @@ class TestEnableDisableUpdateInitramfs(CiTestCase):
         self.mock_which.assert_called_with('update-initramfs',
                                            target=self.target)
 
-    def test_disable_changes_binary_name_write_dummy_binary(self):
+    def test_disable_changes_binary_name_write_stub_binary(self):
         self.mock_which.return_value = self.update_initramfs
         self.mock_subp.side_effect = iter([('', '')] * 10)
         curthooks.disable_update_initramfs({}, self.target)
@@ -119,7 +119,7 @@ class TestEnableDisableUpdateInitramfs(CiTestCase):
         self.assertEqual([call('update-initramfs', target=self.target)],
                          self.mock_which.call_args_list)
 
-        # make sure we have a dummy binary
+        # make sure we have a stub binary
         target_update_initramfs = self.target + self.update_initramfs
         self.assertTrue(os.path.exists(target_update_initramfs))
         self.assertTrue(util.is_exe(target_update_initramfs))
@@ -176,7 +176,7 @@ class TestEnableDisableUpdateInitramfs(CiTestCase):
             lhs = [call(tname, target=self.target)]
             self.assertIn(lhs, self.mock_which.call_args_list)
 
-            # make sure we have a dummy binary
+            # make sure we have a stub binary
             target_tool = self.target + tool
             self.assertTrue(os.path.exists(target_tool))
             self.assertTrue(util.is_exe(target_tool))