run: rename merged_capture→merge_out_err

This name better matches the purpose of this variable.

Author: rezib

lib/rift/Mock.py

@@ -172,7 +172,7 @@ def _exec(self, cmd):
             cmd,
             live_output=logging.getLogger().isEnabledFor(logging.INFO),
             capture_output=True,
-            merged_capture=True,
+            merge_out_err=True,
             cwd='/'
         )
         if proc.returncode != 0:

lib/rift/run.py

@@ -59,14 +59,14 @@ def run_command(
         cmd,
         live_output=True,
         capture_output=False,
-        merged_capture=False,
+        merge_out_err=False,
         **kwargs
     ):
     """
     Run a command and return a RunResult named tuple. When live_output is True,
     command stdout/stderr are redirected to current process stdout/stderr. When
     capture_output is True, command stdout/stderr are available in out/err
-    attributes of RunResult namedtuple. When merged_capture is True as well,
+    attributes of RunResult namedtuple. When merge_out_err is True as well,
     command stderr is merged with stdout in out attribute of RunResult named
     tuple. In this case, err attribute is None.
 
@@ -100,7 +100,7 @@ def run_command(
         # Initialize string buffers to store process output in memory
         buf_out = io.StringIO()
         buf_err = None
-        if not merged_capture:
+        if not merge_out_err:
             buf_err = io.StringIO()
 
         # Process output lines handlers
@@ -111,7 +111,7 @@ def handle_stdout(stream):
                 sys.stdout.write(line)
         def handle_stderr(stream):
             line = stream.readline()
-            if merged_capture:
+            if merge_out_err:
                 buf_out.write(line)
             else:
                 buf_err.write(line)
@@ -133,7 +133,7 @@ def handle_stderr(stream):
             if live_output:
                 sys.stdout.write(line)
         for line in process.stderr:
-            if merged_capture:
+            if merge_out_err:
                 buf_out.write(line)
             else:
                 buf_err.write(line)
@@ -148,7 +148,7 @@ def handle_stderr(stream):
 
     out = buf_out.getvalue()
     buf_out.close()
-    if merged_capture:
+    if merge_out_err:
         err = None
     else:
         err = buf_err.getvalue()

tests/run.py

@@ -55,8 +55,8 @@ def test_run_command_capture_stderr(self, mock_stderr):
     @patch('sys.stderr', new_callable=StringIO)
     def test_run_command_capture_stderr_merged(self, mock_stderr):
         """ Test run_command() with merged error output capture. """
-        proc = run_command("/bin/echo error_data 1>&2",
-                capture_output=True, merged_capture=True, shell=True)
+        proc = run_command("/bin/echo error_data 1>&2", capture_output=True,
+                merge_out_err=True, shell=True)
         # With merged_capture, standard err must be available in out attribute
         # of RunResult named tuple, and err attribute must be None.
         self.assertEqual(proc.out, "error_data\n")
@@ -68,7 +68,7 @@ def test_run_command_capture_stderr_merged(self, mock_stderr):
     def test_run_command_capture_both_merged(self, mock_stderr):
         """ Test run_command() with merged error and standard output capture. """
         proc = run_command("/bin/echo error_data 1>&2 && /bin/echo output_data",
-                capture_output=True, merged_capture=True, shell=True)
+                capture_output=True, merge_out_err=True, shell=True)
         # With merge_out_err, standard err must be available in out attribute
         # of RunResult named tuple, and err attribute must be None.
         self.assertEqual(proc.out, "error_data\noutput_data\n")