MAAS

Merge lp:~andreserl/maas/lp1541878_1.10 into lp:maas/1.10

  1. lp1541878_1.10
  2. Merge into 1.10
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4577
Proposed branch: lp:~andreserl/maas/lp1541878_1.10
Merge into: lp:maas/1.10
Diff against target: 51 lines (+5/-5)
2 files modified
src/provisioningserver/drivers/power/ipmi.py (+1/-1)
src/provisioningserver/drivers/power/tests/test_ipmi.py (+4/-4)
To merge this branch: bzr merge lp:~andreserl/maas/lp1541878_1.10
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+285129@code.launchpad.net

This proposal supersedes a proposal from 2016-02-04.

Commit message

Backport rev4641: Fix issue of decoding the output of the IPMI command.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
--- src/provisioningserver/drivers/power/ipmi.py 2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/power/ipmi.py 2016-02-04 22:26:11 +0000
@@ -76,7 +76,7 @@
76 env = shell.select_c_utf8_locale()76 env = shell.select_c_utf8_locale()
77 command = tuple(command) # For consistency when testing.77 command = tuple(command) # For consistency when testing.
78 try:78 try:
79 output = call_and_check(command, env=env)79 output = call_and_check(command, env=env).decode("utf-8")
80 except ExternalProcessError as e:80 except ExternalProcessError as e:
81 raise PowerFatalError(81 raise PowerFatalError(
82 "Failed to power %s %s: %s" % (82 "Failed to power %s %s: %s" % (
8383
=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
--- src/provisioningserver/drivers/power/tests/test_ipmi.py 2015-12-01 18:12:59 +0000
+++ src/provisioningserver/drivers/power/tests/test_ipmi.py 2016-02-04 22:26:11 +0000
@@ -165,7 +165,7 @@
165 process.communicate.return_value = (b'', b'')165 process.communicate.return_value = (b'', b'')
166 process.returncode = 0166 process.returncode = 0
167 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')167 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
168 call_and_check_mock.return_value = 'on'168 call_and_check_mock.return_value = b'on'
169169
170 result = ipmi_power_driver._issue_ipmi_command('on', **context)170 result = ipmi_power_driver._issue_ipmi_command('on', **context)
171171
@@ -194,7 +194,7 @@
194 process.communicate.return_value = (b'', b'')194 process.communicate.return_value = (b'', b'')
195 process.returncode = 0195 process.returncode = 0
196 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')196 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
197 call_and_check_mock.return_value = 'off'197 call_and_check_mock.return_value = b'off'
198198
199 result = ipmi_power_driver._issue_ipmi_command('off', **context)199 result = ipmi_power_driver._issue_ipmi_command('off', **context)
200200
@@ -224,7 +224,7 @@
224 process.communicate.return_value = (b'', b'')224 process.communicate.return_value = (b'', b'')
225 process.returncode = 0225 process.returncode = 0
226 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')226 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
227 call_and_check_mock.return_value = 'off'227 call_and_check_mock.return_value = b'off'
228228
229 result = ipmi_power_driver._issue_ipmi_command('off', **context)229 result = ipmi_power_driver._issue_ipmi_command('off', **context)
230230
@@ -250,7 +250,7 @@
250 process.communicate.return_value = (b'', b'')250 process.communicate.return_value = (b'', b'')
251 process.returncode = 0251 process.returncode = 0
252 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')252 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
253 call_and_check_mock.return_value = 'other'253 call_and_check_mock.return_value = b'other'
254254
255 result = ipmi_power_driver._issue_ipmi_command('query', **context)255 result = ipmi_power_driver._issue_ipmi_command('query', **context)
256256

Subscribers

People subscribed via source and target branches