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
1=== modified file 'src/provisioningserver/drivers/power/ipmi.py'
2--- src/provisioningserver/drivers/power/ipmi.py 2015-12-01 18:12:59 +0000
3+++ src/provisioningserver/drivers/power/ipmi.py 2016-02-04 22:26:11 +0000
4@@ -76,7 +76,7 @@
5 env = shell.select_c_utf8_locale()
6 command = tuple(command) # For consistency when testing.
7 try:
8- output = call_and_check(command, env=env)
9+ output = call_and_check(command, env=env).decode("utf-8")
10 except ExternalProcessError as e:
11 raise PowerFatalError(
12 "Failed to power %s %s: %s" % (
13
14=== modified file 'src/provisioningserver/drivers/power/tests/test_ipmi.py'
15--- src/provisioningserver/drivers/power/tests/test_ipmi.py 2015-12-01 18:12:59 +0000
16+++ src/provisioningserver/drivers/power/tests/test_ipmi.py 2016-02-04 22:26:11 +0000
17@@ -165,7 +165,7 @@
18 process.communicate.return_value = (b'', b'')
19 process.returncode = 0
20 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
21- call_and_check_mock.return_value = 'on'
22+ call_and_check_mock.return_value = b'on'
23
24 result = ipmi_power_driver._issue_ipmi_command('on', **context)
25
26@@ -194,7 +194,7 @@
27 process.communicate.return_value = (b'', b'')
28 process.returncode = 0
29 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
30- call_and_check_mock.return_value = 'off'
31+ call_and_check_mock.return_value = b'off'
32
33 result = ipmi_power_driver._issue_ipmi_command('off', **context)
34
35@@ -224,7 +224,7 @@
36 process.communicate.return_value = (b'', b'')
37 process.returncode = 0
38 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
39- call_and_check_mock.return_value = 'off'
40+ call_and_check_mock.return_value = b'off'
41
42 result = ipmi_power_driver._issue_ipmi_command('off', **context)
43
44@@ -250,7 +250,7 @@
45 process.communicate.return_value = (b'', b'')
46 process.returncode = 0
47 call_and_check_mock = self.patch(ipmi_module, 'call_and_check')
48- call_and_check_mock.return_value = 'other'
49+ call_and_check_mock.return_value = b'other'
50
51 result = ipmi_power_driver._issue_ipmi_command('query', **context)
52

Subscribers

People subscribed via source and target branches