From 1d88c57be8a27de4af9bd63a2f1a2f6c836de90f Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 18 Sep 2018 20:43:09 -0600 Subject: [PATCH] Adjust Prime95 countown message --- .bin/Scripts/functions/hw_diags.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index 089e51a7..e9e8109a 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -93,6 +93,7 @@ TESTS = { def connect_to_db(): """Connect to osTicket database.""" + #TODO# Open SSH tunnel to DB server ost_db['Connection'] = mariadb.connect( user=DB_USER, password=DB_PASS, database=DB_NAME, host=DB_HOST) ost_db['Cursor'] = ost_db['Connection'].cursor() @@ -597,8 +598,10 @@ def run_mprime(): try: for i in range(int(MPRIME_LIMIT)): clear_screen() - print_standard('Running Prime95 ({} minutes left)'.format( - int(MPRIME_LIMIT)-i)) + min_left = int(MPRIME_LIMIT)-i) + print_standard('Running Prime95 ({} minute{} left)'.format( + min_left, + 's' if min_left != 1 else '') print_warning('If running too hot, press CTRL+c to abort the test') sleep(60) except KeyboardInterrupt: