From 0fae4128ed58251451b24aa2e1ea63b43eece174 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 29 Sep 2018 13:25:10 -0600
Subject: [PATCH] Adjusted Prime95 osTicket report

* Post report regardless of result
---
 .bin/Scripts/functions/hw_diags.py | 60 ++++++++++++++----------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 41b93081..ed775a0e 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -979,39 +979,35 @@ def run_mprime(ticket_number):
     update_progress()
 
     # Build osTicket report
-    if TESTS['Prime95']['Status'] not in ['Unknown', 'Aborted']:
-        report = ['System {} Prime95 testing.'.format(
-            'FAILED' if TESTS['Prime95']['NS'] else 'passed')]
-        report.append('')
-        report.append('Prime95 log:')
-        log_path = '{}/prime.log'.format(global_vars['LogDir'])
-        try:
-            with open(log_path, 'r') as f:
-                for line in f.readlines():
-                    line = line.strip()
-                    r = re.search('(completed \d+ tests.*)', line, re.IGNORECASE)
-                    if r:
-                        report.append(r.group(1))
-        except:
-            report.append('ERROR: Failed to read log.')
-        report.append('')
-        report.append('Final temps:')
-        log_path = '{}/Final Temps.log'.format(global_vars['LogDir'])
-        try:
-            with open(log_path, 'r') as f:
-                for line in f.readlines():
-                    line = line.strip()
-                    if not line:
-                        # Stop after CPU temp(s)
-                        break
-                    report.append(line)
-        except:
-            report.append('ERROR: Failed to read log.')
+    report = ['Prime95 ({}):'.format(TESTS['Prime95']['Status'])]
+    log_path = '{}/prime.log'.format(global_vars['LogDir'])
+    try:
+        with open(log_path, 'r') as f:
+            for line in f.readlines():
+                line = line.strip()
+                r = re.search('(completed \d+ tests.*)', line, re.IGNORECASE)
+                if r:
+                    report.append(r.group(1))
+    except:
+        report.append('ERROR: Failed to read log.')
+    report.append('')
+    report.append('Final temps:')
+    log_path = '{}/Final Temps.log'.format(global_vars['LogDir'])
+    try:
+        with open(log_path, 'r') as f:
+            for line in f.readlines():
+                line = line.strip()
+                if not line:
+                    # Stop after CPU temp(s)
+                    break
+                report.append(line)
+    except:
+        report.append('ERROR: Failed to read log.')
 
-        # Upload osTicket report
-        osticket_post_reply(
-            ticket_id=ticket_number,
-            response='\n'.join(report))
+    # Upload osTicket report
+    osticket_post_reply(
+        ticket_id=ticket_number,
+        response='\n'.join(report))
 
     # Done
     run_program('tmux kill-pane -a'.split())