2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Show test results in osTicket report

Browse source 
* Fixes issue #19
This commit is contained in:
2Shirt 2018-09-28 13:43:18 -06:00
parent dc8f48a6b4
commit aa1fda8ac4
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.bin/Scripts/functions/hw_diags.py
View file

@ -543,7 +543,8 @@ def post_drive_results(ticket_number):
# NVMe/SMART Attributes # NVMe/SMART Attributes
if dev.get('NVMe Disk', False): if dev.get('NVMe Disk', False):
report.append('NVMe Attributes:') report.append('NVMe Attributes ({}):'.format(
TESTS['NVMe/SMART']['Status'][name]))
for attrib in sorted(ATTRIBUTES['NVMe'].keys()): for attrib in sorted(ATTRIBUTES['NVMe'].keys()):
if attrib in dev['nvme-cli']: if attrib in dev['nvme-cli']:
report.append('{attrib:30}{value}'.format( report.append('{attrib:30}{value}'.format(
@ -553,7 +554,8 @@ def post_drive_results(ticket_number):
report[-1] = report[-1].strip().replace(' ', '.') report[-1] = report[-1].strip().replace(' ', '.')
report[-1] = report[-1].replace('_', ' ') report[-1] = report[-1].replace('_', ' ')
elif dev['smartctl'].get('ata_smart_attributes', None): elif dev['smartctl'].get('ata_smart_attributes', None):
report.append('SMART Attributes:') report.append('SMART Attributes ({}):'.format(
TESTS['NVMe/SMART']['Status'][name]))
s_table = dev['smartctl'].get('ata_smart_attributes', {}).get( s_table = dev['smartctl'].get('ata_smart_attributes', {}).get(
'table', {}) 'table', {})
s_table = {a.get('id', 'Unknown'): a for a in s_table} s_table = {a.get('id', 'Unknown'): a for a in s_table}
@ -577,7 +579,8 @@ def post_drive_results(ticket_number):
# badblocks # badblocks
bb_status = TESTS['badblocks']['Status'].get(name, None) bb_status = TESTS['badblocks']['Status'].get(name, None)
if TESTS['badblocks']['Enabled'] and bb_status not in ['Denied', 'Skipped']: if TESTS['badblocks']['Enabled'] and bb_status not in ['Denied', 'Skipped']:
report.append('badblocks:') report.append('badblocks ({}):'.format(
TESTS['badblocks']['Status'][name]))
bb_result = TESTS['badblocks']['Results'].get( bb_result = TESTS['badblocks']['Results'].get(
name, name,
'ERROR: Failed to read log.') 'ERROR: Failed to read log.')
@ -602,7 +605,8 @@ def post_drive_results(ticket_number):
oneline=True) oneline=True)
for c in COLORS.values(): for c in COLORS.values():
one_line_graph = one_line_graph.replace(c, '') one_line_graph = one_line_graph.replace(c, '')
report.append('I/O Benchmark:') report.append('I/O Benchmark ({}):'.format(
TESTS['iobenchmark']['Status'][name]))
report.append(one_line_graph) report.append(one_line_graph)
report.append('{}'.format( report.append('{}'.format(
TESTS['iobenchmark']['Data'][name]['Avg/Min/Max'])) TESTS['iobenchmark']['Data'][name]['Avg/Min/Max']))