Merge lp:~bladernr/checkbox/1472406 into lp:checkbox

[Jeff Lane ]

ipmi_test should fail on any module failure rather than quietly exit. Leave it to results review rather than assume failure indicates no BMC.

[Zygmunt Krynicki (zyga)]

+1, thanks

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/ipmi_test'
--- providers/plainbox-provider-checkbox/bin/ipmi_test	2014-03-20 14:01:58 +0000
+++ providers/plainbox-provider-checkbox/bin/ipmi_test	2015-07-07 22:17:19 +0000
@@ -8,12 +8,9 @@
         echo "Loading $module..."
         modprobe $module
         result=$?
-        # if ipmi_si fails to load, it's safe to assume the system
-        # has no BMC, so we'll just politely exit.
-        if [ $result -eq 1 ] && [ "$module" = "ipmi_si" ]; then
-            echo "WARNING: No BMC found. Aborting."
-            exit 0
-        elif [ $result -eq 1 ]; then
+        # If the IPMI drivers don't load, it could be the system has no BMC, or
+        # the IPMI driver is bad.  We should error and Fail here.
+        if [ $result -eq 1 ]; then
             echo "ERROR: Unable to load module $module" >&2
             echo "Aborting IPMI test run." >&2
             exit 1