From 7ac035c578b2fe62b308a14d783b96d6f3fbc98d Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 18 Dec 2018 15:21:05 -0700
Subject: [PATCH] Safety wheels off

---
 .bin/Scripts/functions/hw_diags.py | 22 +++++++---------------
 .bin/Scripts/settings/main.py      |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index dc71c54f..cfe68c69 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -837,13 +837,11 @@ def menu_diags(state, args):
     elif selection == 'R':
       print('(FAKE) reboot...')
       sleep(1)
-      # TODO uncomment below
-      #run_program(['systemctl', 'reboot'])
+      run_program(['systemctl', 'reboot'])
     elif selection == 'P':
       print('(FAKE) poweroff...')
       sleep(1)
-      # TODO uncomment below
-      #run_program(['systemctl', 'poweroff'])
+      run_program(['systemctl', 'poweroff'])
     elif selection == 'Q':
       break
     elif selection == 'S':
@@ -1242,8 +1240,7 @@ def run_mprime_test(state, test):
     message='Getting idle temps...', indent=0,
     function=save_average_temp, cs='Done',
     sensor_data=test.sensor_data, temp_label='Idle',
-    seconds=3)
-  # TODO: Remove seconds kwarg above
+    seconds=5)
 
   # Stress CPU
   print_log('Starting Prime95')
@@ -1253,9 +1250,7 @@ def run_mprime_test(state, test):
     state.panes['mprime'],
     command=['hw-diags-prime95', global_vars['TmpDir']],
     working_dir=global_vars['TmpDir'])
-  #time_limit = int(MPRIME_LIMIT) * 60
-  # TODO: restore above line
-  time_limit = 30
+  time_limit = int(MPRIME_LIMIT) * 60
   try:
     for i in range(time_limit):
       clear_screen()
@@ -1301,14 +1296,12 @@ def run_mprime_test(state, test):
   clear_screen()
   try_and_print(
     message='Letting CPU cooldown for bit...', indent=0,
-    function=sleep, cs='Done', seconds=3)
-  # TODO: Above seconds should be 10
+    function=sleep, cs='Done', seconds=10)
   try_and_print(
     message='Getting cooldown temps...', indent=0,
     function=save_average_temp, cs='Done',
     sensor_data=test.sensor_data, temp_label='Cooldown',
-    seconds=3)
-  # TODO: Remove seconds kwarg above
+    seconds=5)
 
   # Move logs to Ticket folder
   for item in os.scandir(global_vars['TmpDir']):
@@ -1447,8 +1440,7 @@ def run_nvme_smart_tests(state, test):
       # Prep
       test.timeout = test.dev.smart_self_test['polling_minutes'].get(
         'short', 5)
-      # TODO: fix timeout, set to polling + 5
-      test.timeout = int(test.timeout) + 1
+      test.timeout = int(test.timeout) + 5
       _include_short_test = True
       _self_test_started = False
 
diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py
index 7b915bdb..9d32b3ef 100644
--- a/.bin/Scripts/settings/main.py
+++ b/.bin/Scripts/settings/main.py
@@ -15,7 +15,7 @@ KIT_NAME_FULL='WizardKit'
 KIT_NAME_SHORT='WK'
 SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
 # Live Linux
-MPRIME_LIMIT='7'                          # of minutes to run Prime95 during hw-diags
+MPRIME_LIMIT='7'                           # of minutes to run Prime95 during hw-diags
 ROOT_PASSWORD='Abracadabra'
 TECH_PASSWORD='Abracadabra'
 # Server IP addresses