pipeline: return logs in --json mode
A pipeline run only returned logs in the `StageFailed` and `AssemblerFailed` exceptions. Remove those and always return structured data instead. It only returns data for stages that actually ran (i.e., didn't come from the cache). This is similar to the output in interactive mode. Also change osbuildtest to be able to deal with output that is larger than the pipe buffer by using subprocess.communicate().
This commit is contained in:
parent
f1b9361837
commit
82a2be53d4
4 changed files with 67 additions and 73 deletions
|
|
@ -42,23 +42,19 @@ class TestCase(unittest.TestCase):
|
|||
|
||||
stdin = subprocess.PIPE if input else None
|
||||
|
||||
p = subprocess.Popen(osbuild_cmd, encoding="utf-8", stdin=stdin, stdout=subprocess.PIPE)
|
||||
if input:
|
||||
p.stdin.write(input)
|
||||
p.stdin.close()
|
||||
p = subprocess.Popen(osbuild_cmd, encoding="utf-8", stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
|
||||
try:
|
||||
r = p.wait()
|
||||
if r != 0:
|
||||
print(p.stdout.read())
|
||||
self.assertEqual(r, 0)
|
||||
output, _ = p.communicate(input)
|
||||
if p.returncode != 0:
|
||||
print(output)
|
||||
self.assertEqual(p.returncode, 0)
|
||||
except KeyboardInterrupt:
|
||||
# explicitly wait again to let osbuild clean up
|
||||
p.wait()
|
||||
raise
|
||||
|
||||
result = json.load(p.stdout)
|
||||
p.stdout.close()
|
||||
return result["tree_id"], result["output_id"]
|
||||
result = json.loads(output)
|
||||
return result.get("tree_id"), result.get("output_id")
|
||||
|
||||
def run_tree_diff(self, tree1, tree2):
|
||||
tree_diff_cmd = ["./tree-diff", tree1, tree2]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue