Merge lp:~newell-jensen/maas/ipmi-regex-return-output-when-no-match into lp:maas/1.9

[Newell Jensen]

Return output from ipmipower for _issue_ipmi_command when there is no match with the regex.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py	2016-04-25 16:30:09 +0000
+++ src/provisioningserver/drivers/power/ipmi.py	2016-04-25 21:27:11 +0000
@@ -25,7 +25,6 @@
 from provisioningserver.drivers.power import (
     PowerAuthError,
     PowerDriver,
-    PowerError,
     PowerFatalError,
 )
 from provisioningserver.logger import get_maas_logger
@@ -99,13 +98,11 @@
                 "Failed to power %s %s: %s" % (
                     power_change, power_address, e.output_as_unicode))
         else:
-            match = re.search(":\s*(on|off|ok)", output)
+            match = re.search(":\s*(on|off)", output)
             if match is None:
-                raise PowerError(
-                    "IPMI Power Driver unable to extract node power"
-                    " state from: %s" % output)
+                return output
             else:
-                # If there is a match this should be either on/off/ok
+                # If there is a match this will be either on/off
                 return match.group(1)
 
     def _issue_ipmi_command(
 
=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py	2016-04-23 00:17:34 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py	2016-04-25 21:27:11 +0000
@@ -30,7 +30,6 @@
 from provisioningserver.drivers.power import (
     ipmi as ipmi_module,
     PowerAuthError,
-    PowerError,
     PowerFatalError,
 )
 from provisioningserver.drivers.power.ipmi import (
@@ -313,7 +312,7 @@
             PowerFatalError, ipmi_power_driver._issue_ipmi_command,
             'on', **context)
 
-    def test__issue_ipmi_command_crashes_when_unable_to_find_match(self):
+    def test__issue_ipmi_command_returns_output_when_no_regex_match(self):
         _, _, _, _, _, _, _, context = make_parameters()
         ipmi_power_driver = IPMIPowerDriver()
         popen_mock = self.patch(ipmi_module, 'Popen')
@@ -322,10 +321,8 @@
         process.returncode = 0
         call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
         call_and_check_mock.return_value = "Rubbish"
-
-        self.assertRaises(
-            PowerError, ipmi_power_driver._issue_ipmi_command,
-            'on', **context)
+        result = ipmi_power_driver._issue_ipmi_command('on', **context)
+        self.assertEqual(result, "Rubbish")
 
     def test_power_on_calls__issue_ipmi_command(self):
         _, _, _, _, _, _, _, context = make_parameters()