Merge lp:~bladernr/checkbox/1224820-fix-storage-test into lp:checkbox

[Jeff Lane ]

scripts/storage_test: fixes a bug that causes script to improperly die when run against a disk that's not mounted. Script now exits with a warning in this condition.

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-09-12 19:23:58 +0000
+++ checkbox-old/debian/changelog	2013-09-13 08:53:38 +0000
@@ -8,6 +8,10 @@
     (LP: #1224533)
   * Ensured that pactl commands are run on a properly unlocalized environment
     (LP: #1201126)
+  
+  [ Jeff Lane ]
+  * scripts/storage_test: test now exits with a warning if the drive is not
+    mounted prior to testing (LP: #1224820)
 
  -- Brendan Donegan <[e-mail]>  Mon, 09 Sep 2013 09:30:32 +0100
 

=== modified file 'checkbox-old/scripts/storage_test'
--- checkbox-old/scripts/storage_test	2013-08-29 23:46:49 +0000
+++ checkbox-old/scripts/storage_test	2013-09-13 08:53:38 +0000
@@ -42,6 +42,15 @@
         echo "$disk reports a size of $size."
         # Have to account for the end of the size descriptor
         size_range=${size:(-2)}
+	
+        if mount | grep -q $disk
+        then
+            echo "$disk is mounted, proceeding."
+        else
+            echo "$disk is not mounted. It must be mounted before testing."
+            exit 1
+        fi
+
 
         if [ $size_range == "KB" ]
         then