This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8620

tests: make it clear what happen when no response entered
ClosedPublic

Authored by khanchi97 on Jun 8 2020, 2:25 AM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG617cd3b1e9cd: tests: make it clear what happen when no response entered

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jun 8 2020, 2:25 AM
marmoute accepted this revision.Jun 8 2020, 6:15 AM
pulkit added a subscriber: pulkit.Jun 9 2020, 5:22 AM
pulkit added inline comments.
tests/run-tests.py
2263

I think a / in between will be nice. Similar to what apt upgrade shows, something like [y/N].

khanchi97 updated this revision to Diff 21588.Jun 9 2020, 12:19 PM
pulkit accepted this revision.Jun 9 2020, 1:17 PM
This revision is now accepted and ready to land.Jun 9 2020, 1:17 PM

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (2 lines)
Mtests/test-run-tests.t (12 lines)

Diff 21590

tests/run-tests.py

# handle interactive prompt without releasing iolock # handle interactive prompt without releasing iolock
if self._options.interactive: if self._options.interactive:
if test.readrefout() != expected: if test.readrefout() != expected:
self.stream.write( self.stream.write(
'Reference output has changed (run again to prompt ' 'Reference output has changed (run again to prompt '
'changes)' 'changes)'
) )
else: else:
self.stream.write('Accept this change? [n] ') self.stream.write('Accept this change? [y/N] ')
pulkitUnsubmitted
Not Done

I think a / in between will be nice. Similar to what apt upgrade shows, something like [y/N].

pulkit: I think a `/` in between will be nice. Similar to what `apt upgrade` shows, something like `…
self.stream.flush() self.stream.flush()
answer = sys.stdin.readline().strip() answer = sys.stdin.readline().strip()
if answer.lower() in ('y', 'yes'): if answer.lower() in ('y', 'yes'):
if test.path.endswith(b'.t'): if test.path.endswith(b'.t'):
rename(test.errpath, test.path) rename(test.errpath, test.path)
else: else:
rename(test.errpath, '%s.out' % test.path) rename(test.errpath, '%s.out' % test.path)
accepted = True accepted = True

tests/test-run-tests.t

+++ $TESTTMP/test-failure.t.err +++ $TESTTMP/test-failure.t.err
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
$ echo babar $ echo babar
- rataxes - rataxes
+ babar + babar
This is a noop statement so that This is a noop statement so that
this test is still more bytes than success. this test is still more bytes than success.
pad pad pad pad............................................................ pad pad pad pad............................................................
Accept this change? [n] Accept this change? [y/N]
ERROR: test-failure.t output changed ERROR: test-failure.t output changed
!. !.
Failed test-failure.t: output changed Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 1 failed. # Ran 2 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ cat test-failure.t $ cat test-failure.t
$ echo babar $ echo babar
rataxes rataxes
This is a noop statement so that This is a noop statement so that
this test is still more bytes than success. this test is still more bytes than success.
pad pad pad pad............................................................ pad pad pad pad............................................................
pad pad pad pad............................................................ pad pad pad pad............................................................
pad pad pad pad............................................................ pad pad pad pad............................................................
pad pad pad pad............................................................ pad pad pad pad............................................................
pad pad pad pad............................................................ pad pad pad pad............................................................
pad pad pad pad............................................................ pad pad pad pad............................................................
Interactive with custom view Interactive with custom view
$ echo 'n' | rt -i --view echo $ echo 'n' | rt -i --view echo
running 2 tests using 1 parallel processes running 2 tests using 1 parallel processes
$TESTTMP/test-failure.t $TESTTMP/test-failure.t.err $TESTTMP/test-failure.t $TESTTMP/test-failure.t.err
Accept this change? [n]* (glob) Accept this change? [y/N]* (glob)
ERROR: test-failure.t output changed ERROR: test-failure.t output changed
!. !.
Failed test-failure.t: output changed Failed test-failure.t: output changed
# Ran 2 tests, 0 skipped, 1 failed. # Ran 2 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
View the fix View the fix
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
$ echo 'saved backup bundle to $TESTTMP/foo.hg' $ echo 'saved backup bundle to $TESTTMP/foo.hg'
saved backup bundle to $TESTTMP/foo.hg saved backup bundle to $TESTTMP/foo.hg
$ echo 'saved backup bundle to $TESTTMP/foo.hg' $ echo 'saved backup bundle to $TESTTMP/foo.hg'
- saved backup bundle to $TESTTMP\foo.hg - saved backup bundle to $TESTTMP\foo.hg
+ saved backup bundle to $TESTTMP/foo.hg + saved backup bundle to $TESTTMP/foo.hg
$ echo 'saved backup bundle to $TESTTMP/foo.hg' $ echo 'saved backup bundle to $TESTTMP/foo.hg'
saved backup bundle to $TESTTMP/*.hg (glob) saved backup bundle to $TESTTMP/*.hg (glob)
Accept this change? [n] .. Accept this change? [y/N] ..
# Ran 2 tests, 0 skipped, 0 failed. # Ran 2 tests, 0 skipped, 0 failed.
$ sed -e 's,(glob)$,&<,g' test-failure.t $ sed -e 's,(glob)$,&<,g' test-failure.t
$ echo babar $ echo babar
babar babar
This is a noop statement so that This is a noop statement so that
this test is still more bytes than success. this test is still more bytes than success.
pad pad pad pad............................................................ pad pad pad pad............................................................
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
#testcases a b #testcases a b
#if a #if a
$ echo 1 $ echo 1
+ 1 + 1
#endif #endif
#if b #if b
$ echo 2 $ echo 2
Accept this change? [n] . Accept this change? [y/N] .
--- $TESTTMP/test-cases.t --- $TESTTMP/test-cases.t
+++ $TESTTMP/test-cases.t#b.err +++ $TESTTMP/test-cases.t#b.err
@@ -5,4 +5,5 @@ @@ -5,4 +5,5 @@
#endif #endif
#if b #if b
$ echo 2 $ echo 2
+ 2 + 2
#endif #endif
Accept this change? [n] . Accept this change? [y/N] .
# Ran 2 tests, 0 skipped, 0 failed. # Ran 2 tests, 0 skipped, 0 failed.
$ cat test-cases.t $ cat test-cases.t
#testcases a b #testcases a b
#if a #if a
$ echo 1 $ echo 1
1 1
#endif #endif
+++ $TESTTMP/test-failure.t.err +++ $TESTTMP/test-failure.t.err
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
$ echo babar $ echo babar
- rataxes - rataxes
+ babar + babar
This is a noop statement so that This is a noop statement so that
this test is still more bytes than success. this test is still more bytes than success.
pad pad pad pad............................................................ pad pad pad pad............................................................
Accept this change? [n] ..s Accept this change? [y/N] ..s
Skipped test-skip.t: missing feature: nail clipper Skipped test-skip.t: missing feature: nail clipper
# Ran 2 tests, 1 skipped, 0 failed. # Ran 2 tests, 1 skipped, 0 failed.
$ cat report.json $ cat report.json
testreport ={ testreport ={
"test-failure.t": [\{] (re) "test-failure.t": [\{] (re)
"csys": "\s*\d+\.\d{3,4}", ? (re) "csys": "\s*\d+\.\d{3,4}", ? (re)
"cuser": "\s*\d+\.\d{3,4}", ? (re) "cuser": "\s*\d+\.\d{3,4}", ? (re)