fixed write command to not return error string

canonical · Aug 15, 2023 · 8a4af19 · 8a4af19
1 parent 6d74db9
commit 8a4af19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cloudinit/cmd/devel/logs.py b/cloudinit/cmd/devel/logs.py
@@ -152,7 +152,6 @@ def _write_command_output_to_file(cmd, filename, msg, verbosity):
     except ProcessExecutionError as e:
         write_file(filename, str(e))
         _debug("collecting %s failed.\n" % msg, 1, verbosity)
-        return str(e)
     else:
         _debug("collected %s\n" % msg, 1, verbosity)
         return output

diff --git a/tests/unittests/cmd/devel/test_logs.py b/tests/unittests/cmd/devel/test_logs.py
@@ -239,7 +239,7 @@ def test_write_command_output_to_file(self, m_getuid, tmpdir):
 
         assert test_str + "\n" == return_output1
         assert test_str + "\n" == load_file(output_file1)
-        assert expected_stderr == return_output2
+        assert None == return_output2
         assert expected_stderr == load_file(output_file2)
 
     def test_stream_command_output_to_file(self, m_getuid, tmpdir):