From 98c0c34bf8edf8d47381350621fe379a442abbff Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 26 Dec 2018 17:11:37 -0700 Subject: [PATCH 1/2] Removed unused vertical_graph data --- .bin/Scripts/functions/hw_diags.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index cbfd4377..c183a69d 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -1057,7 +1057,6 @@ def run_io_benchmark(state, test): try: test.merged_rates = [] test.read_rates = [] - test.vertical_graph = [] test.dev.calc_io_dd_values() # Run dd read tests @@ -1084,10 +1083,6 @@ def run_io_benchmark(state, test): # Add rate to lists test.read_rates.append(cur_rate) - test.vertical_graph.append( - '{percent:0.1f} {rate}'.format( - percent=(i/test.dev.dd_chunks)*100, - rate=int(cur_rate/(1024**2)))) # Show progress if i % IO_VARS['Progress Refresh Rate'] == 0: @@ -1172,10 +1167,6 @@ def run_io_benchmark(state, test): elif not 'N/A' in test.status: test.update_status('Unknown') - # Save log - with open(test.io_benchmark_out.replace('.', '-raw.'), 'a') as f: - f.write('\n'.join(test.vertical_graph)) - # Done update_progress_pane(state) From dcc2e5cd6a03784332a29bff51b731e64917f2ee Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 26 Dec 2018 21:00:29 -0700 Subject: [PATCH 2/2] Adjusted top pane text --- .bin/Scripts/functions/hw_diags.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py index c183a69d..a4184689 100644 --- a/.bin/Scripts/functions/hw_diags.py +++ b/.bin/Scripts/functions/hw_diags.py @@ -861,7 +861,7 @@ def run_badblocks_test(state, test): # Update tmux layout tmux_update_pane( state.panes['Top'], - text='{}\nbadblocks: {}'.format( + text='{}\n{}'.format( TOP_PANE_TEXT, test.dev.description)) test.tmux_layout = TMUX_LAYOUT.copy() test.tmux_layout.update({ @@ -1031,7 +1031,7 @@ def run_io_benchmark(state, test): # Update tmux layout tmux_update_pane( state.panes['Top'], - text='{}\nI/O Benchmark: {}'.format( + text='{}\n{}'.format( TOP_PANE_TEXT, test.dev.description)) test.tmux_layout = TMUX_LAYOUT.copy() test.tmux_layout.update({ @@ -1194,7 +1194,7 @@ def run_mprime_test(state, test): # Update tmux layout tmux_update_pane( state.panes['Top'], - text='{}\nPrime95: {}'.format(TOP_PANE_TEXT, test.dev.name)) + text='{}\n{}'.format(TOP_PANE_TEXT, test.dev.name)) test.tmux_layout = TMUX_LAYOUT.copy() test.tmux_layout.update({ 'Temps': {'y': 1000, 'Check': False}, @@ -1391,7 +1391,7 @@ def run_nvme_smart_tests(state, test): # Update tmux layout tmux_update_pane( state.panes['Top'], - text='{}\nDisk Health: {}'.format( + text='{}\n{}'.format( TOP_PANE_TEXT, test.dev.description)) test.tmux_layout = TMUX_LAYOUT.copy() test.tmux_layout.update({