3 "executable" keyword argument to subprocess.Popen() (and allow for it to be |
3 "executable" keyword argument to subprocess.Popen() (and allow for it to be |
4 mocked out during testing). |
4 mocked out during testing). |
5 |
5 |
6 This patch is not suitable for pushing upstream. |
6 This patch is not suitable for pushing upstream. |
7 |
7 |
8 diff --git a/swift/common/manager.py b/swift/common/manager.py |
8 --- swift-2.2.0/swift/common/manager.py.~1~ 2014-10-16 05:05:21.000000000 -0700 |
9 --- a/swift/common/manager.py |
9 +++ swift-2.2.0/swift/common/manager.py 2014-12-13 21:29:46.790264480 -0800 |
10 +++ b/swift/common/manager.py |
10 @@ -576,7 +576,8 @@ class Server(object): |
11 @@ -534,7 +534,8 @@ class Server(): |
|
12 re_out = subprocess.PIPE |
11 re_out = subprocess.PIPE |
13 else: |
12 else: |
14 re_out = open(os.devnull, 'w+b') |
13 re_out = open(os.devnull, 'w+b') |
15 - proc = subprocess.Popen(args, stdout=re_out, stderr=re_err) |
14 - proc = subprocess.Popen(args, stdout=re_out, stderr=re_err) |
16 + proc = subprocess.Popen(args, stdout=re_out, stderr=re_err, |
15 + proc = subprocess.Popen(args, stdout=re_out, stderr=re_err, |
17 + executable='/usr/lib/swift/' + self.cmd) |
16 + executable='/usr/lib/swift/' + self.cmd) |
18 pid_file = self.get_pid_file_name(conf_file) |
17 pid_file = self.get_pid_file_name(conf_file) |
19 write_file(pid_file, proc.pid) |
18 write_file(pid_file, proc.pid) |
20 self.procs.append(proc) |
19 self.procs.append(proc) |
21 diff --git a/test/unit/common/test_manager.py b/test/unit/common/test_manager.py |
20 --- swift-2.2.0/test/unit/common/test_manager.py.~1~ 2014-10-16 05:05:21.000000000 -0700 |
22 --- a/test/unit/common/test_manager.py |
21 +++ swift-2.2.0/test/unit/common/test_manager.py 2014-12-13 21:30:06.746265266 -0800 |
23 +++ b/test/unit/common/test_manager.py |
22 @@ -955,7 +955,7 @@ class TestServer(unittest.TestCase): |
24 @@ -858,7 +858,7 @@ class TestServer(unittest.TestCase): |
23 class MockProc(object): |
25 class MockProc(): |
|
26 |
24 |
27 def __init__(self, pid, args, stdout=MockProcess.NOTHING, |
25 def __init__(self, pid, args, stdout=MockProcess.NOTHING, |
28 - stderr=MockProcess.NOTHING): |
26 - stderr=MockProcess.NOTHING): |
29 + stderr=MockProcess.NOTHING, executable=None): |
27 + stderr=MockProcess.NOTHING, executable=None): |
30 self.pid = pid |
28 self.pid = pid |