Skip to content

Commit 2b34fc4

Browse files
committed
Added WARN as an alternative to soft failures
1 parent 3d24b5a commit 2b34fc4

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

unit-tests/unit

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ score = {
9090
"total" : 0,
9191
"skipped" : 0,
9292
"passed" : 0,
93+
"warned" : 0,
9394
"failed" : 0,
9495
}
9596

@@ -107,19 +108,26 @@ def skipped(msg=None, indent=1):
107108
vwrite("%s\n"%yellow("SKIP"), 1)
108109
if msg: vwrite("%s %s %s\n"%(" "*indent, yellow("S"), msg), 1)
109110

111+
def warned(msg=None, indent=1):
112+
global score
113+
score["total"] += 1
114+
score["warned"] += 1
115+
vwrite("%s\n"%yellow("WARN"), 1)
116+
if msg: vwrite("%s %s %s\n"%(" "*indent, yellow("S"), msg), 1)
117+
110118
def failed(msg=None, indent=1):
111119
global score
112120
score["total"] += 1
113121
score["failed"] += 1
114122
vwrite("%s\n"%red("FAIL"), 1)
115123
if msg: vwrite("%s %s %s\n"%(" "*indent, red("F"), msg), 1)
116124

117-
def test(r, msg=None, indent=1):
125+
def test(r, msg=None, indent=1, bad=failed):
118126
if r:
119127
passed(msg, indent)
120128
return True
121129
else:
122-
failed(msg, indent)
130+
bad(msg, indent)
123131
return False
124132

125133
def vwrite(msg, vLevel=0):
@@ -135,8 +143,12 @@ os.dup2(err.fileno(), sys.stderr.fileno())
135143

136144
vwrite(LINE, 1)
137145
vwrite(" * Testing for command line version of dmidecode ...", 1)
138-
dmidecode_bin = True in [os.path.exists(os.path.join(_, "dmidecode")) for _ in os.getenv("PATH").split(':')]
139-
test(dmidecode_bin)
146+
dmidecode_bin = True in [
147+
os.path.exists(
148+
os.path.join(_, "dmidecode")
149+
) for _ in os.getenv("PATH").split(':')
150+
]
151+
test(dmidecode_bin, bad=warned)
140152
if root_user:
141153
vwrite(" * Running test as root user, all tests will be executed\n", 1)
142154
else:
@@ -343,6 +355,7 @@ vwrite(LINE, 1)
343355
vwrite("Devices : %s\n"%cyan(len(devices)), 1)
344356
vwrite("Total : %s\n"%blue(score["total"]), 1)
345357
vwrite("Skipped : %s\n"%yellow(score["skipped"]), 1)
358+
vwrite("Warned : %s\n"%yellow(score["warned"]), 1)
346359
vwrite("Passed : %s\n"%green(score["passed"]), 1)
347360
vwrite("Failed : %s\n"%red(score["failed"]), 1)
348361

0 commit comments

Comments
 (0)