monitor: refactor class LogLine to log_entry()
The class LogLine() is purely used as a dataclass with no state and the only function on it is `as_dict()`. This got refactored into a new function `log_entry()` because there is no need for this to be a class. The function that takes the same inputs.
This commit is contained in:
parent
16c1768780
commit
ac16590838
2 changed files with 39 additions and 31 deletions
|
|
@ -7,13 +7,14 @@ import json
|
|||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
import unittest
|
||||
from collections import defaultdict
|
||||
|
||||
import osbuild
|
||||
import osbuild.meta
|
||||
from osbuild.monitor import LogMonitor
|
||||
from osbuild.monitor import JSONSeqMonitor, Context, Progress, LogLine
|
||||
from osbuild.monitor import JSONSeqMonitor, Context, Progress, log_entry
|
||||
from osbuild.objectstore import ObjectStore
|
||||
from osbuild.pipeline import Runner
|
||||
|
||||
|
|
@ -241,3 +242,21 @@ def test_json_progress_monitor():
|
|||
assert logitem["message"] == "pipeline 2 starting"
|
||||
assert logitem["context"]["origin"] == "org.osbuild"
|
||||
assert logitem["context"]["pipeline"]["name"] == "test-pipeline-second"
|
||||
|
||||
|
||||
def test_log_line_empty_is_fine():
|
||||
empty = log_entry()
|
||||
assert len(empty) == 1
|
||||
assert empty["timestamp"] > time.time()-60
|
||||
assert empty["timestamp"] < time.time()+60
|
||||
|
||||
|
||||
def test_log_line_with_entries():
|
||||
ctx = Context("some-origin")
|
||||
progress = Progress(name="foo", total=2)
|
||||
entry = log_entry("some-msg", ctx, progress)
|
||||
assert len(entry) == 4
|
||||
assert entry["message"] == "some-msg"
|
||||
assert isinstance(entry["context"], dict)
|
||||
assert isinstance(entry["progress"], dict)
|
||||
assert entry["timestamp"] > 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue