particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild/monitor.py: improve naming of progress

Browse source
This commit is contained in:
Florian Schüller 2024-05-08 19:20:32 +02:00 • committed by Florian Schüller
parent 86cd09b121
commit 41f528eeb2
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
osbuild/monitor.py
View file

@ -317,7 +317,7 @@ class JSONSeqMonitor(BaseMonitor):
def begin(self, pipeline: osbuild.Pipeline):
self._context.set_pipeline(pipeline)
if pipeline.stages:
self._progress.sub_progress = Progress("stages", len(pipeline.stages))
self._progress.sub_progress = Progress(f"pipeline: {pipeline.name}", len(pipeline.stages))
self.log(f"Starting pipeline {pipeline.name}", origin="osbuild.monitor")
# finish is for pipelines

2
test/mod/test_monitor.py
View file

@ -233,6 +233,7 @@ def test_json_progress_monitor():
logitem = json.loads(log[i])
assert logitem["message"] == "Starting pipeline test-pipeline-first"
assert logitem["context"]["pipeline"]["name"] == "test-pipeline-first"
assert logitem["progress"]["progress"]["name"] == "pipeline: test-pipeline-first"
# empty items are omited
assert "name" not in logitem["context"]["pipeline"]["stage"]
i += 1
@ -276,6 +277,7 @@ def test_json_progress_monitor():
logitem = json.loads(log[i])
assert logitem["message"] == "Starting pipeline test-pipeline-second"
assert logitem["progress"]["progress"]["name"] == "pipeline: test-pipeline-second"
assert logitem["context"]["origin"] == "osbuild.monitor"
assert logitem["context"]["pipeline"]["name"] == "test-pipeline-second"
i += 1