This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10762

tests: fix test-transaction-safety.t on Windows
ClosedPublic

Authored by mharbison72 on May 21 2021, 12:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb1ce93dcdf3c: tests: fix test-transaction-safety.t on Windows
Summary

Mostly this is about C:\dir\sub style paths being turned into C:dirsub by
MSYS, and not being about to execute shell scripts in hooks directly. See also
a12819559ccb::9e3979a25bfe.

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.

Revision Contents
Changeset List

PathPackages
Mtests/test-transaction-safety.t (18 lines)

Diff 28190

tests/test-transaction-safety.t

$ HG_TEST_FILE_EXT_WAITING=$TESTTMP/sync/ext_waiting $ HG_TEST_FILE_EXT_WAITING=$TESTTMP/sync/ext_waiting
$ export HG_TEST_FILE_EXT_WAITING $ export HG_TEST_FILE_EXT_WAITING
$ HG_TEST_FILE_EXT_UNLOCK=$TESTTMP/sync/ext_unlock $ HG_TEST_FILE_EXT_UNLOCK=$TESTTMP/sync/ext_unlock
$ export HG_TEST_FILE_EXT_UNLOCK $ export HG_TEST_FILE_EXT_UNLOCK
$ HG_TEST_FILE_EXT_DONE=$TESTTMP/sync/ext_done $ HG_TEST_FILE_EXT_DONE=$TESTTMP/sync/ext_done
$ export HG_TEST_FILE_EXT_DONE $ export HG_TEST_FILE_EXT_DONE
$ cat << EOF > script/external.sh $ cat << EOF > script/external.sh
> #!/bin/sh > #!/bin/sh
> $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_UNLOCK $HG_TEST_FILE_EXT_WAITING > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_UNLOCK" "$HG_TEST_FILE_EXT_WAITING"
> hg log --rev 'tip' -T 'external: {rev} {desc}\n' > $TESTTMP/output/external.out > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > "$TESTTMP/output/external.out"
> touch $HG_TEST_FILE_EXT_DONE > touch "$HG_TEST_FILE_EXT_DONE"
> EOF > EOF
$ chmod +x script/external.sh
$ cat << EOF > script/internal.sh $ cat << EOF > script/internal.sh
> #!/bin/sh > #!/bin/sh
> hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > $TESTTMP/output/internal.out > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > "$TESTTMP/output/internal.out"
> $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_DONE $HG_TEST_FILE_EXT_UNLOCK > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_DONE" "$HG_TEST_FILE_EXT_UNLOCK"
> EOF > EOF
$ chmod +x script/internal.sh
Automated commands: Automated commands:
$ make_one_commit() { $ make_one_commit() {
> rm -f $TESTTMP/sync/* > rm -f $TESTTMP/sync/*
> rm -f $TESTTMP/output/* > rm -f $TESTTMP/output/*
> hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n' > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
> echo x >> a > echo x >> a
> $TESTTMP/script/external.sh & hg commit -m "$1" > sh $TESTTMP/script/external.sh & hg commit -m "$1"
> cat $TESTTMP/output/external.out > cat $TESTTMP/output/external.out
> cat $TESTTMP/output/internal.out > cat $TESTTMP/output/internal.out
> hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n' > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
> } > }
$ make_one_pull() { $ make_one_pull() {
> rm -f $TESTTMP/sync/* > rm -f $TESTTMP/sync/*
> rm -f $TESTTMP/output/* > rm -f $TESTTMP/output/*
> hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n' > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
> echo x >> a > echo x >> a
> $TESTTMP/script/external.sh & hg pull ../other-repo/ --rev "$1" --force --quiet > sh $TESTTMP/script/external.sh & hg pull ../other-repo/ --rev "$1" --force --quiet
> cat $TESTTMP/output/external.out > cat $TESTTMP/output/external.out
> cat $TESTTMP/output/internal.out > cat $TESTTMP/output/internal.out
> hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n' > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
> } > }
prepare a large source to which to pull from: prepare a large source to which to pull from:
The source is large to unsure we don't use inline more after the pull The source is large to unsure we don't use inline more after the pull
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [extensions] > [extensions]
> small_inline=$TESTTMP/ext/small_inline.py > small_inline=$TESTTMP/ext/small_inline.py
> [hooks] > [hooks]
> pretxnclose = $TESTTMP/script/internal.sh > pretxnclose = sh $TESTTMP/script/internal.sh
> EOF > EOF
check this is true for the initial commit (inline → inline) check this is true for the initial commit (inline → inline)
----------------------------------------------------------- -----------------------------------------------------------
the repository should still be inline (for relevant format) the repository should still be inline (for relevant format)
$ make_one_commit first $ make_one_commit first