Skip to content

stop test runner if working tree becomes dirty #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hoffbrinkle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stop test runner if working tree becomes dirty #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions bin/git-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,21 @@ class Test(object):
sys.stderr.write(colored(FAIL_TRAILER_TEMPLATE % dict(), AnsiColor.RED))
self.write_status(revision, 'bad')
raise
else:
sys.stdout.write('%s^{tree} %s\n' % (revision, good_bad_text('good')))
self.write_status(revision, 'good')

try:
require_clean_work_tree('mark good')
except UncleanWorkTreeError:
sys.stdout.write('%s^{tree} %s\n' % (revision, good_bad_text('bad')))
if verbosity >= -1:
sys.stderr.write(colored(FAIL_HEADER_TEMPLATE % dict(revision=revision), AnsiColor.RED))
cmd = ['git', '--no-pager', 'log', '-1', '--decorate', revision]
chatty_call(cmd, level=-1)
sys.stderr.write(colored(FAIL_TRAILER_TEMPLATE % dict(), AnsiColor.RED))
self.write_status(revision, 'bad')
raise

sys.stdout.write('%s^{tree} %s\n' % (revision, good_bad_text('good')))
self.write_status(revision, 'good')

def remove_status(self, msg):
"""Delete the note reference for this test."""
Expand Down
9 changes: 9 additions & 0 deletions test/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,15 @@ test_expect_success 'default (passing): combine args and stdin' '
test_cmp expected numbers.log
'

test_expect_success 'default (passing): stop if working tree is dirty' '
rm -f numbers.log &&
test_when_finished "git reset --hard HEAD" &&
git-test add --test dirty "echo 1 >> number" &&
gen_stdout c4 bad > expected-stdout &&
test_expect_code 125 git-test run --test dirty c3..c5 >actual-stdout &&
test_cmp expected-stdout actual-stdout
'

test_expect_success 'default (failing-4-7-8): test range' '
git-test forget-results &&
git-test add "test-number --log=numbers.log --bad 4 7 8 666 --good \*" &&
Expand Down