Merge pull request #1300 from ZyX-I/stabilize-vterm-tests

Another attempt to stabilize vterm tests
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2015-02-07 22:08:05 +03:00
commit fc7057c85b
2 changed files with 3 additions and 3 deletions

View File

@ -1,2 +1,2 @@
if-shell 'test -z "$POWERLINE_CONFIG_COMMAND"' 'set-environment -g POWERLINE_CONFIG_COMMAND powerline-config; run-shell "env \"\$POWERLINE_CONFIG_COMMAND\" tmux setup"' 'run-shell "env \"\$POWERLINE_CONFIG_COMMAND\" tmux setup"' if-shell 'env "$POWERLINE_CONFIG_COMMAND" tmux setup' '' 'run-shell "powerline-config tmux setup"'
# vim: ft=tmux # vim: ft=tmux

View File

@ -42,7 +42,7 @@ def test_expected_result(p, expected_result, cols, rows):
return True return True
attempts -= 1 attempts -= 1
print('Actual result does not match expected. Attempts left: {0}.'.format(attempts)) print('Actual result does not match expected. Attempts left: {0}.'.format(attempts))
sleep(10) sleep(2)
print('Result:') print('Result:')
shesc_result = ''.join(( shesc_result = ''.join((
'{0}{1}\x1b[m'.format(cell_properties_key_to_shell_escape(key), text) '{0}{1}\x1b[m'.format(cell_properties_key_to_shell_escape(key), text)
@ -157,7 +157,7 @@ def main():
}, },
) )
p.start() p.start()
sleep(10) sleep(2)
expected_result_new = ( expected_result_new = (
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), (((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '),
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), (((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '),