tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-29 00:34:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor environment and expected results

Browse Source
This commit is contained in:
Foo 2017-04-30 02:13:41 +03:00
parent 14982fc693
commit fb769d7297
2 changed files with 178 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
tests/test_in_vterm/test_tmux.py
View File

@ -4,6 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct
import os import os
import sys import sys
import json
from time import sleep from time import sleep
from subprocess import check_call from subprocess import check_call
@ -36,7 +37,7 @@ def cell_properties_key_to_shell_escape(cell_properties_key):
def test_expected_result(p, expected_result, cols, rows, print_logs): def test_expected_result(p, expected_result, cols, rows, print_logs):
expected_text, attrs = convert_expected_result(p, expected_result) expected_text, attrs = expected_result
attempts = 3 attempts = 3
result = None result = None
while attempts: while attempts:
@ -74,7 +75,11 @@ def test_expected_result(p, expected_result, cols, rows, print_logs):
return False return False
def get_expected_result(tmux_version, expected_result_old, expected_result_1_7=None, expected_result_new=None, expected_result_2_0=None): def get_expected_result(tmux_version,
expected_result_old,
expected_result_1_7=None,
expected_result_new=None,
expected_result_2_0=None):
if tmux_version >= (2, 0) and expected_result_2_0: if tmux_version >= (2, 0) and expected_result_2_0:
return expected_result_2_0 return expected_result_2_0
elif tmux_version >= (1, 8) and expected_result_new: elif tmux_version >= (1, 8) and expected_result_new:
@ -98,29 +103,7 @@ def main(attempts=3):
else: else:
lib = os.environ.get('POWERLINE_LIBVTERM', 'libvterm.so') lib = os.environ.get('POWERLINE_LIBVTERM', 'libvterm.so')
try: env = {
p = ExpectProcess(
lib=lib,
rows=rows,
cols=cols,
cmd=tmux_exe,
args=[
# Specify full path to tmux socket (testing tmux instance must
# not interfere with user one)
'-S', socket_path,
# Force 256-color mode
'-2',
# Request verbose logging just in case
'-v',
# Specify configuration file
'-f', os.path.abspath('powerline/bindings/tmux/powerline.conf'),
# Run bash three times
'new-session', 'bash --norc --noprofile -i', ';',
'new-window', 'bash --norc --noprofile -i', ';',
'new-window', 'bash --norc --noprofile -i', ';',
],
cwd=VTERM_TEST_DIR,
env={
# Reasoning: # Reasoning:
# 1. vt* TERMs (used to be vt100 here) make tmux-1.9 use # 1. vt* TERMs (used to be vt100 here) make tmux-1.9 use
# different and identical colors for inactive windows. This # different and identical colors for inactive windows. This
@ -154,77 +137,115 @@ def main(attempts=3):
'SHELL': os.path.join(VTERM_TEST_DIR, 'path', 'bash'), 'SHELL': os.path.join(VTERM_TEST_DIR, 'path', 'bash'),
'POWERLINE_CONFIG_PATHS': os.path.abspath('powerline/config_files'), 'POWERLINE_CONFIG_PATHS': os.path.abspath('powerline/config_files'),
'POWERLINE_COMMAND': 'powerline-render', 'POWERLINE_COMMAND': 'powerline-render',
'POWERLINE_THEME_OVERRIDES': ( 'POWERLINE_THEME_OVERRIDES': ';'.join((
'default.segments.right=[{"type":"string","name":"s1","highlight_groups":["cwd"],"priority":50}];' key + '=' + json.dumps(val)
'default.segments.left=[{"type":"string","name":"s2","highlight_groups":["background"],"priority":20}];' for key, val in (
'default.segment_data.s1.contents=S1 string here;' ('default.segments.right', [{
'default.segment_data.s2.contents=S2 string here;' 'type': 'string',
), 'name': 's1',
'highlight_groups': ['cwd'],
'priority':50,
}]),
('default.segments.left', [{
'type': 'string',
'name': 's2',
'highlight_groups': ['background'],
'priority':20,
}]),
('default.segment_data.s1.contents', 'S1 string here'),
('default.segment_data.s2.contents', 'S2 string here'),
)
)),
'LD_LIBRARY_PATH': os.environ.get('LD_LIBRARY_PATH', ''), 'LD_LIBRARY_PATH': os.environ.get('LD_LIBRARY_PATH', ''),
'PYTHONPATH': os.environ.get('PYTHONPATH', ''), 'PYTHONPATH': os.environ.get('PYTHONPATH', ''),
}, }
try:
p = ExpectProcess(
lib=lib,
rows=rows,
cols=cols,
cmd=tmux_exe,
args=[
# Specify full path to tmux socket (testing tmux instance must
# not interfere with user one)
'-S', socket_path,
# Force 256-color mode
'-2',
# Request verbose logging just in case
'-v',
# Specify configuration file
'-f', os.path.abspath('powerline/bindings/tmux/powerline.conf'),
# Run bash three times
'new-session', 'bash --norc --noprofile -i', ';',
'new-window', 'bash --norc --noprofile -i', ';',
'new-window', 'bash --norc --noprofile -i', ';',
],
cwd=VTERM_TEST_DIR,
env=env,
) )
p.start() p.start()
sleep(5) sleep(5)
tmux_version = get_tmux_version(get_fallback_logger()) tmux_version = get_tmux_version(get_fallback_logger())
expected_result = get_expected_result(tmux_version, expected_result_old=( expected_result = get_expected_result(
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), tmux_version,
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), expected_result_old=(
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' S2 string here '), '{1: 0 }{2: }{3: S2 string here }{4: 0 }'
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 0 '), '{5:| }{6:bash }{3: }{4: 1- }'
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), '{5:| }{6:bash }{3: }{7: }'
(((188, 188, 188), (11, 11, 11), 0, 0, 0), 'bash '), '{8:2* | }{9:bash }{10: }'
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), '{3:' + (' ' * 124) + '}'
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 1- '), '{5: }{11: S1 string here }', {
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), ((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
(((188, 188, 188), (11, 11, 11), 0, 0, 0), 'bash '), ((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), ((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), ((133, 133, 133), (11, 11, 11), 0, 0, 0): 4,
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), ((88, 88, 88), (11, 11, 11), 0, 0, 0): 5,
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), ((188, 188, 188), (11, 11, 11), 0, 0, 0): 6,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), ((11, 11, 11), (0, 102, 153), 0, 0, 0): 7,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' ' * 124), ((102, 204, 255), (0, 102, 153), 0, 0, 0): 8,
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), ((255, 255, 255), (0, 102, 153), 1, 0, 0): 9,
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here '), ((0, 102, 153), (11, 11, 11), 0, 0, 0): 10,
), expected_result_new=( ((199, 199, 199), (88, 88, 88), 0, 0, 0): 11,
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), }),
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), expected_result_new=(
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' S2 string here '), '{1: 0 }{2: }{3: S2 string here }{4: 0 }'
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 0 '), '{5:| }{6:bash }{3: }{4: 1- }'
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), '{5:| }{7:bash }{3: }{8: }'
(((188, 188, 188), (11, 11, 11), 0, 0, 0), 'bash '), '{9:2* | }{10:bash }{7: }'
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), '{3:' + (' ' * 124) + '}'
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 1- '), '{5: }{11: S1 string here }', {
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), ((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), 'bash '), ((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), ((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), ((133, 133, 133), (11, 11, 11), 0, 0, 0): 4,
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), ((88, 88, 88), (11, 11, 11), 0, 0, 0): 5,
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), ((188, 188, 188), (11, 11, 11), 0, 0, 0): 6,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), ((0, 102, 153), (11, 11, 11), 0, 0, 0): 7,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' ' * 124), ((11, 11, 11), (0, 102, 153), 0, 0, 0): 8,
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), ((102, 204, 255), (0, 102, 153), 0, 0, 0): 9,
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here '), ((255, 255, 255), (0, 102, 153), 1, 0, 0): 10,
), expected_result_2_0=( ((199, 199, 199), (88, 88, 88), 0, 0, 0): 11,
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), }),
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), expected_result_2_0=(
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' S2 string here '), '{1: 0 }{2: }{3: S2 string here }{4: 0 }'
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 0 '), '{5:| }{6:bash }{3: }{4: 1- }'
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), '{5:| }{7:bash }{3: }{8: }'
(((188, 188, 188), (11, 11, 11), 0, 0, 0), 'bash '), '{9:2* | }{10:bash }{7: }'
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), '{3:' + (' ' * 125) + '}{5: }{11: S1 string here }', {
(((133, 133, 133), (11, 11, 11), 0, 0, 0), ' 1- '), ((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
(((88, 88, 88), (11, 11, 11), 0, 0, 0), '| '), ((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), 'bash '), ((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), ((133, 133, 133), (11, 11, 11), 0, 0, 0): 4,
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), ((88, 88, 88), (11, 11, 11), 0, 0, 0): 5,
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), ((188, 188, 188), (11, 11, 11), 0, 0, 0): 6,
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), ((0, 102, 153), (11, 11, 11), 0, 0, 0): 7,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), ((11, 11, 11), (0, 102, 153), 0, 0, 0): 8,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' ' * 125), ((102, 204, 255), (0, 102, 153), 0, 0, 0): 9,
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), ((255, 255, 255), (0, 102, 153), 1, 0, 0): 10,
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here '), ((199, 199, 199), (88, 88, 88), 0, 0, 0): 11,
)) }),
)
ret = None ret = None
if not test_expected_result(p, expected_result, cols, rows, not attempts): if not test_expected_result(p, expected_result, cols, rows, not attempts):
if attempts: if attempts:
@ -237,47 +258,58 @@ def main(attempts=3):
cols = 40 cols = 40
p.resize(rows, cols) p.resize(rows, cols)
sleep(5) sleep(5)
expected_result = get_expected_result(tmux_version, ( expected_result = get_expected_result(
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' ' * cols), tmux_version,
), expected_result_1_7=( expected_result_old=('{1:' + (' ' * cols) + '}', {
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), ((255, 255, 255), (11, 11, 11), 0, 0, 0): 1,
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), }),
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' <'), expected_result_1_7=(
(((188, 188, 188), (11, 11, 11), 0, 0, 0), 'h '), '{1: 0 }'
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), '{2: }{3: <}{4:h }{3: }{5: }'
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), '{6:2* | }{7:bash }{8: }{3: }{9: }'
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), '{10: S1 string here }', {
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), ((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), ((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), ((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), ((188, 188, 188), (11, 11, 11), 0, 0, 0): 4,
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here ') ((11, 11, 11), (0, 102, 153), 0, 0, 0): 5,
), expected_result_new=( ((102, 204, 255), (0, 102, 153), 0, 0, 0): 6,
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), ((255, 255, 255), (0, 102, 153), 1, 0, 0): 7,
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), ((0, 102, 153), (11, 11, 11), 0, 0, 0): 8,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' <'), ((88, 88, 88), (11, 11, 11), 0, 0, 0): 9,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), 'h '), ((199, 199, 199), (88, 88, 88), 0, 0, 0): 10,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), }),
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), expected_result_new=(
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), '{1: 0 }'
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), '{2: }{3: <}{4:h }{3: }{5: }'
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), '{6:2* | }{7:bash }{4: }{3: }{8: }'
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), '{9: S1 string here }', {
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), ((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here ') ((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
), expected_result_2_0=( ((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
(((0, 0, 0), (243, 243, 243), 1, 0, 0), ' 0 '), ((0, 102, 153), (11, 11, 11), 0, 0, 0): 4,
(((243, 243, 243), (11, 11, 11), 0, 0, 0), ' '), ((11, 11, 11), (0, 102, 153), 0, 0, 0): 5,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), '<'), ((102, 204, 255), (0, 102, 153), 0, 0, 0): 6,
(((0, 102, 153), (11, 11, 11), 0, 0, 0), 'ash '), ((255, 255, 255), (0, 102, 153), 1, 0, 0): 7,
(((255, 255, 255), (11, 11, 11), 0, 0, 0), ' '), ((88, 88, 88), (11, 11, 11), 0, 0, 0): 8,
(((11, 11, 11), (0, 102, 153), 0, 0, 0), ' '), ((199, 199, 199), (88, 88, 88), 0, 0, 0): 9,
(((102, 204, 255), (0, 102, 153), 0, 0, 0), '2* | '), }),
(((255, 255, 255), (0, 102, 153), 1, 0, 0), 'bash '), expected_result_2_0=(
(((0, 102, 153), (11, 11, 11), 0, 0, 0), ' '), '{1: 0 }'
(((88, 88, 88), (11, 11, 11), 0, 0, 0), ' '), '{2: }{3:<}{4:ash }{3: }{5: }'
(((199, 199, 199), (88, 88, 88), 0, 0, 0), ' S1 string here ') '{6:2* | }{7:bash }{4: }{8: }'
)) '{9: S1 string here }', {
((0, 0, 0), (243, 243, 243), 1, 0, 0): 1,
((243, 243, 243), (11, 11, 11), 0, 0, 0): 2,
((255, 255, 255), (11, 11, 11), 0, 0, 0): 3,
((0, 102, 153), (11, 11, 11), 0, 0, 0): 4,
((11, 11, 11), (0, 102, 153), 0, 0, 0): 5,
((102, 204, 255), (0, 102, 153), 0, 0, 0): 6,
((255, 255, 255), (0, 102, 153), 1, 0, 0): 7,
((88, 88, 88), (11, 11, 11), 0, 0, 0): 8,
((199, 199, 199), (88, 88, 88), 0, 0, 0): 9,
}),
)
if not test_expected_result(p, expected_result, cols, rows, not attempts): if not test_expected_result(p, expected_result, cols, rows, not attempts):
if attempts: if attempts:
pass pass
@ -288,11 +320,8 @@ def main(attempts=3):
if ret is not None: if ret is not None:
return ret return ret
finally: finally:
pass check_call([tmux_exe, '-S', socket_path, 'kill-server'], env=env,
# check_call([tmux_exe, '-S', socket_path, 'kill-server'], env={ cwd=VTERM_TEST_DIR)
# 'PATH': vterm_path,
# 'LD_LIBRARY_PATH': os.environ.get('LD_LIBRARY_PATH', ''),
# }, cwd=VTERM_TEST_DIR)
return main(attempts=(attempts - 1)) return main(attempts=(attempts - 1))

1
tests/test_in_vterm/test_tmux.sh
View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
exit 0
. tests/common.sh . tests/common.sh
enter_suite tmux enter_suite tmux