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.

Download Raw Diff

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

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

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

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 17 2021, 10:05 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

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

marmoute added a parent revision: D11450: check-code: make it possible to ignore the PWD check in some situation.Sep 17 2021, 3:05 PM

marmoute updated this revision to Diff 30293.

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

			Path	Packages
M			contrib/check-code.py (2 lines)
M			tests/test-removeemptydirs.t (18 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30287		Sep 17 2021, 10:05 AM	★	★
Diff 2	30293		Sep 17 2021, 3:05 PM	★	★
Diff 3	30302	rHG1941064d37130f4683293dd6746def1f4f15c37f	Sep 17 2021, 3:04 PM	★	★

Commit	Parents	Author	Summary	Date
5444f4b42407	5b9de38a0356	Pierre-Yves David		Sep 17 2021, 6:10 AM

	Status	Author	Revision
	Closed	marmoute	D11449 tests: make removeemptydirs more portable
	Closed	marmoute	D11450 check-code: make it possible to ignore the PWD check in some situation

Diff 30287

contrib/check-code.py

	"don't use 'find -printf', it doesn't exist on BSD find(1)",			"don't use 'find -printf', it doesn't exist on BSD find(1)",
	),			),
	(r'\$RANDOM ', "don't use bash-only $RANDOM to generate random values"),			(r'\$RANDOM ', "don't use bash-only $RANDOM to generate random values"),
	],			],
	# warnings			# warnings
	[			[
	(r'^function', "don't use 'function', use old style"),			(r'^function', "don't use 'function', use old style"),
	(r'^diff.-\wN', "don't use 'diff -N'"),			(r'^diff.-\wN', "don't use 'diff -N'"),
	(r'\$PWD\|\${PWD}', "don't use $PWD, use `pwd`"),			(r'\$PWD\|\${PWD}', "don't use $PWD, use `pwd`", "no-pwd-check"),
	(r'^([^"\'\n]\|("[^"\n]")\|(\'[^\'\n]\'))*\^', "^ must be quoted"),			(r'^([^"\'\n]\|("[^"\n]")\|(\'[^\'\n]\'))*\^', "^ must be quoted"),
	(r'kill (`\|\$\()', "don't use kill, use killdaemons.py"),			(r'kill (`\|\$\()', "don't use kill, use killdaemons.py"),
	],			],
	]			]

	testfilters = [			testfilters = [
	(r"( )(#([^!][^\n]\S)?)", repcomment),			(r"( )(#([^!][^\n]\S)?)", repcomment),
	(r"<<(\S+)((.\|\n)*?\n\1)", rephere),			(r"<<(\S+)((.\|\n)*?\n\1)", rephere),

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