Merge lp:~tribaal/charm-helpers/stable-device-mounted-accepts-partitions into lp:~openstack-charmers/charm-helpers/stable-1604

[Chris Glass]

This MP is to propagate the is_device_mounted changes from trunk to the stable branch.

=== modified file 'charmhelpers/contrib/storage/linux/utils.py'
--- charmhelpers/contrib/storage/linux/utils.py	2014-05-13 16:18:57 +0000
+++ charmhelpers/contrib/storage/linux/utils.py	2014-08-13 09:45:34 +0000
@@ -45,5 +45,8 @@
     :returns: boolean: True if the path represents a mounted device, False if
         it doesn't.
     '''
+    is_partition = bool(re.search(r".*[0-9]+\b", device))
     out = check_output(['mount'])
+    if is_partition:
+        return bool(re.search(device + r"\b", out))
     return bool(re.search(device + r"[0-9]+\b", out))
 
=== modified file 'tests/contrib/storage/test_linux_storage_utils.py'
--- tests/contrib/storage/test_linux_storage_utils.py	2014-05-06 21:25:24 +0000
+++ tests/contrib/storage/test_linux_storage_utils.py	2014-08-13 09:45:34 +0000
@@ -55,9 +55,50 @@
         self.assertTrue(result)
 
     @patch(STORAGE_LINUX_UTILS + '.check_output')
+    def test_is_device_mounted_partition(self, check_output):
+        '''It detects mounted partitions as mounted.'''
+        check_output.return_value = (
+            "/dev/sda1 on / type ext4 (rw,errors=remount-ro)\n")
+        result = storage_utils.is_device_mounted('/dev/sda1')
+        self.assertTrue(result)
+
+    @patch(STORAGE_LINUX_UTILS + '.check_output')
+    def test_is_device_mounted_partition_with_device(self, check_output):
+        '''It detects mounted devices as mounted if "mount" shows only a
+        partition as mounted.'''
+        check_output.return_value = (
+            "/dev/sda1 on / type ext4 (rw,errors=remount-ro)\n")
+        result = storage_utils.is_device_mounted('/dev/sda')
+        self.assertTrue(result)
+
+    @patch(STORAGE_LINUX_UTILS + '.check_output')
     def test_is_device_mounted_not_mounted(self, check_output):
-        '''It detects unmounted devices as mounted.'''
+        '''It detects unmounted devices as not mounted.'''
         check_output.return_value = (
             "/dev/foo on / type ext4 (rw,errors=remount-ro)\n")
         result = storage_utils.is_device_mounted('/dev/sda')
         self.assertFalse(result)
+
+    @patch(STORAGE_LINUX_UTILS + '.check_output')
+    def test_is_device_mounted_not_mounted_partition(self, check_output):
+        '''It detects unmounted partitions as not mounted.'''
+        check_output.return_value = (
+            "/dev/foo on / type ext4 (rw,errors=remount-ro)\n")
+        result = storage_utils.is_device_mounted('/dev/sda1')
+        self.assertFalse(result)
+
+    @patch(STORAGE_LINUX_UTILS + '.check_output')
+    def test_is_device_mounted_cciss(self, check_output):
+        '''It detects mounted cciss partitions as mounted.'''
+        check_output.return_value = (
+            "/dev/cciss/c0d0 on / type ext4 (rw,errors=remount-ro)\n")
+        result = storage_utils.is_device_mounted('/dev/cciss/c0d0')
+        self.assertTrue(result)
+
+    @patch(STORAGE_LINUX_UTILS + '.check_output')
+    def test_is_device_mounted_cciss_not_mounted(self, check_output):
+        '''It detects unmounted cciss partitions as not mounted.'''
+        check_output.return_value = (
+            "/dev/cciss/c0d1 on / type ext4 (rw,errors=remount-ro)\n")
+        result = storage_utils.is_device_mounted('/dev/cciss/c0d0')
+        self.assertFalse(result)