Merge lp:~newell-jensen/maas/1.9-fix-1576468 into lp:maas/1.9

[Newell Jensen]

Selective backport of r4973:

Add missing stderr pipe for APC Power Driver subprocess.

* stderr was not being properly captured, leading to a traceback if the power parameters where not input by the user correctly.

[Newell Jensen (newell-jensen)]

self approved backport

review: Approve

=== modified file 'src/provisioningserver/drivers/hardware/apc.py'
--- src/provisioningserver/drivers/hardware/apc.py	2015-09-30 07:16:42 +0000
+++ src/provisioningserver/drivers/hardware/apc.py	2016-04-29 16:28:52 +0000
@@ -46,7 +46,7 @@
 class APCSNMP:
 
     def run_process(self, command):
-        proc = Popen(command.split(), stdout=PIPE)
+        proc = Popen(command.split(), stdout=PIPE, stderr=PIPE)
         stdout, stderr = proc.communicate()
 
         if proc.returncode != 0:

=== modified file 'src/provisioningserver/drivers/hardware/tests/test_apc.py'
--- src/provisioningserver/drivers/hardware/tests/test_apc.py	2015-05-18 20:01:38 +0000
+++ src/provisioningserver/drivers/hardware/tests/test_apc.py	2016-04-29 16:28:52 +0000
@@ -56,7 +56,8 @@
 
         apc.run_process(command)
         self.assertThat(
-            apc_module.Popen, MockCalledOnceWith(command.split(), stdout=PIPE))
+            apc_module.Popen, MockCalledOnceWith(
+                command.split(), stdout=PIPE, stderr=PIPE))
 
     def test_run_process_returns_result(self):
         ip = factory.make_ipv4_address()