Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
2Shirt 2018-12-26 21:57:11 -07:00
commit 1e064bc9e6
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -867,7 +867,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({
@ -1089,7 +1089,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({
@ -1252,7 +1252,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},
@ -1449,7 +1449,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({