1
0
Fork 0
mirror of synced 2024-12-22 14:41:07 -05:00

Confirm exit status for enter w/cmd

This commit is contained in:
Tim Byrne 2019-12-16 08:47:35 -06:00
parent 7ad28c3a97
commit ba5829ad48
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12

View file

@ -59,14 +59,21 @@ def test_enter(runner, yadm_y, paths, shell, success):
'csh', 'csh',
'zsh', 'zsh',
]) ])
@pytest.mark.parametrize('cmd', [False, True], ids=['no-cmd', 'cmd']) @pytest.mark.parametrize(
'cmd',
[False, 'cmd', 'cmd-bad-exit'],
ids=['no-cmd', 'cmd', 'cmd-bad-exit'])
@pytest.mark.usefixtures('ds1_copy') @pytest.mark.usefixtures('ds1_copy')
def test_enter_shell_ops(runner, yadm_y, paths, shell, opts, path, cmd): def test_enter_shell_ops(runner, yadm_y, paths, shell, opts, path, cmd):
"""Enter tests for specific shell options""" """Enter tests for specific shell options"""
change_exit = '\nfalse' if cmd == 'cmd-bad-exit' else ''
# Create custom shell to detect options passed # Create custom shell to detect options passed
custom_shell = paths.root.join(shell) custom_shell = paths.root.join(shell)
custom_shell.write('#!/bin/sh\necho OPTS=$*\necho PROMPT=$PROMPT') custom_shell.write(
f'#!/bin/sh\necho OPTS=$*\necho PROMPT=$PROMPT{change_exit}'
)
custom_shell.chmod(0o775) custom_shell.chmod(0o775)
test_cmd = ['test1', 'test2', 'test3'] test_cmd = ['test1', 'test2', 'test3']
@ -79,7 +86,10 @@ def test_enter_shell_ops(runner, yadm_y, paths, shell, opts, path, cmd):
env['SHELL'] = custom_shell env['SHELL'] = custom_shell
run = runner(command=yadm_y(*enter_cmd), env=env) run = runner(command=yadm_y(*enter_cmd), env=env)
assert run.success if cmd == 'cmd-bad-exit':
assert run.failure
else:
assert run.success
assert run.err == '' assert run.err == ''
assert f'OPTS={opts}' in run.out assert f'OPTS={opts}' in run.out
assert f'PROMPT=yadm shell ({paths.repo}) {path} >' in run.out assert f'PROMPT=yadm shell ({paths.repo}) {path} >' in run.out