Change cmd_output_bs retcode arg to a boolean check

This commit is contained in:
marsha 2022-10-30 14:47:42 -05:00
parent 71925c47ea
commit 84b38f7b89
15 changed files with 28 additions and 26 deletions

View file

@ -68,7 +68,7 @@ def _make_conflict():
bar_only_file.write('bar')
cmd_output('git', 'add', 'bar_only_file')
git_commit(msg=_make_conflict.__name__)
cmd_output('git', 'merge', 'foo', retcode=None)
cmd_output('git', 'merge', 'foo', check=False)
@pytest.fixture