( )⚙ D11449 tests: make removeemptydirs more portable

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11449

tests: make removeemptydirs more portable
ClosedPublic

Authored by marmoute on Sep 17 2021, 10:05 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1941064d3713: tests: make removeemptydirs more portable
Summary

The behavior of pwd change from one system (i.e. default shell/sh) from one
system to another so we use fuzzy matching for the output we do not care and we
use narrower command call to highlight what we are trying to test here.

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

marmoute created this revision.Sep 17 2021, 10:05 AM
marmoute added a comment.Sep 17 2021, 10:10 AM

If someone on centos can test this, it would be great.

mharbison72 added a subscriber: mharbison72.Sep 19 2021, 3:08 PM
In D11449#175515, @marmoute wrote:

If someone on centos can test this, it would be great.

Runs fine for me on CentOS 7.9.

marmoute added a commit: rHG1941064d3713: tests: make removeemptydirs more portable.Sep 19 2021, 3:45 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1941064d3713: tests: make removeemptydirs more portable (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-removeemptydirs.t (18 lines)

Diff 30302

tests/test-removeemptydirs.t

Tests for experimental.removeemptydirs Tests for experimental.removeemptydirs
$ cat >> pwd.py << EOF
> import os
> try:
> print(os.getcwd())
> except OSError:
> print("<directory is no longer accessible>")
> EOF
$ NO_RM=--config=experimental.removeemptydirs=0 $ NO_RM=--config=experimental.removeemptydirs=0
$ DO_RM=--config=experimental.removeemptydirs=1 $ DO_RM=--config=experimental.removeemptydirs=1
$ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi } $ isdir() { if [ -d $1 ]; then echo yes; else echo no; fi }
$ isfile() { if [ -f $1 ]; then echo yes; else echo no; fi } $ isfile() { if [ -f $1 ]; then echo yes; else echo no; fi }
`hg rm` of the last file in a directory: `hg rm` of the last file in a directory:
$ hg init hgrm $ hg init hgrm
$ cd hgrm $ cd hgrm
current directory was removed (no-windows !) current directory was removed (no-windows !)
(consider changing to repo root: $TESTTMP/hghistedit) (no-windows !) (consider changing to repo root: $TESTTMP/hghistedit) (no-windows !)
$ ls -1 $TESTTMP/hghistedit/ $ ls -1 $TESTTMP/hghistedit/
histedit_commands histedit_commands
r0 r0
r1 r1
r2 r2
somedir somedir
$ pwd #if windows
$ "$PYTHON" "$TESTTMP/pwd.py"
$TESTTMP/hghistedit/somedir $TESTTMP/hghistedit/somedir
#else
$ echo ${PWD} # no-pwd-check
$TESTTMP/hghistedit/somedir
$ "$PYTHON" "$TESTTMP/pwd.py"
<directory is no longer accessible>
#endif
$ ls -1 $TESTTMP/hghistedit/somedir $ ls -1 $TESTTMP/hghistedit/somedir
foo foo
$ ls -1 $ ls -1
foo (windows !) foo (windows !)
Get out of the doomed directory Get out of the doomed directory
$ cd $TESTTMP/hghistedit $ cd $TESTTMP/hghistedit
chdir: error retrieving current directory: getcwd: cannot access parent directories: $ENOENT$ (?)
$ hg files --rev . | grep somedir/ $ hg files --rev . | grep somedir/
somedir/foo somedir/foo
$ cat > histedit_commands <<EOF $ cat > histedit_commands <<EOF
> pick 89079fab8aee 0 r0 > pick 89079fab8aee 0 r0
> pick 7c7a22c6009f 3 migrating_revision > pick 7c7a22c6009f 3 migrating_revision
> pick e6d271df3142 1 r1 > pick e6d271df3142 1 r1