Adjust Prime95 countown message

This commit is contained in:
2Shirt 2018-09-18 20:43:09 -06:00
parent 5edde45f0e
commit 1d88c57be8
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -93,6 +93,7 @@ TESTS = {
def connect_to_db(): def connect_to_db():
"""Connect to osTicket database.""" """Connect to osTicket database."""
#TODO# Open SSH tunnel to DB server
ost_db['Connection'] = mariadb.connect( ost_db['Connection'] = mariadb.connect(
user=DB_USER, password=DB_PASS, database=DB_NAME, host=DB_HOST) user=DB_USER, password=DB_PASS, database=DB_NAME, host=DB_HOST)
ost_db['Cursor'] = ost_db['Connection'].cursor() ost_db['Cursor'] = ost_db['Connection'].cursor()
@ -597,8 +598,10 @@ def run_mprime():
try: try:
for i in range(int(MPRIME_LIMIT)): for i in range(int(MPRIME_LIMIT)):
clear_screen() clear_screen()
print_standard('Running Prime95 ({} minutes left)'.format( min_left = int(MPRIME_LIMIT)-i)
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') print_warning('If running too hot, press CTRL+c to abort the test')
sleep(60) sleep(60)
except KeyboardInterrupt: except KeyboardInterrupt: