Merge pull request #636 from lmlg/fix-popen-communicate

Fix call to Popen.communicate
juju · Mar 4, 2024 · b78107d · b78107d
2 parents 279e113 + e44a15e
commit b78107d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/charmhelpers/contrib/storage/linux/lvm.py b/charmhelpers/contrib/storage/linux/lvm.py
@@ -17,8 +17,6 @@
     CalledProcessError,
     check_call,
     check_output,
-    Popen,
-    PIPE,
 )
 
 
@@ -58,9 +56,7 @@ def remove_lvm_physical_volume(block_device):
 
     :param block_device: str: Full path of block device to scrub.
     '''
-    p = Popen(['pvremove', '-ff', block_device],
-              stdin=PIPE)
-    p.communicate(input='y\n')
+    check_call(['pvremove', '-ff', '--yes', block_device])
 
 
 def list_lvm_volume_group(block_device):

diff --git a/tests/contrib/storage/test_linux_storage_lvm.py b/tests/contrib/storage/test_linux_storage_lvm.py
@@ -80,9 +80,9 @@ def test_deactivate_lvm_volume_groups(self, ls_vg):
 
     def test_remove_lvm_physical_volume(self):
         """It removes LVM physical volume signatures from block device"""
-        with patch(STORAGE_LINUX_LVM + '.Popen') as popen:
+        with patch(STORAGE_LINUX_LVM + '.check_call') as popen:
             lvm.remove_lvm_physical_volume('/dev/foo')
-            popen.assert_called_with(['pvremove', '-ff', '/dev/foo'], stdin=-1)
+            popen.assert_called_with(['pvremove', '-ff', '--yes', '/dev/foo'])
 
     def test_is_physical_volume(self):
         """It properly reports block dev is an LVM PV"""