This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5248

tests: remove obsolete PYTHONPATH override from remotefilelog tests
ClosedPublic

Authored by martinvonz on Nov 9 2018, 2:28 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGdef08813b290: tests: remove obsolete PYTHONPATH override from remotefilelog tests

Summary

They were added in
https://bitbucket.org/facebook/hg-experimental/commits/fdcad37a6a68cfbaf5920f3eeaa0cc9cae42bd26,
which says this:

When remotefilelog moved from its own repo, the tests needed to be updated to
adjust the PYTHONPATH to ensure the in-repo remotefilelog was loaded instead of
the system one.

This meant any local runs of remotefilelog tests would've been using the system
remotefilelog unless the user had manually set the PYTHONPATH themselves.

That doesn't seem relevant with remotefilelog in core.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Nov 9 2018, 2:28 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 9 2018, 2:28 PM

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

martinvonz added a child revision: D5249: remotefilelog: remove unused configs for {data,history}pack version.Nov 9 2018, 2:28 PM

pulkit accepted this revision.Nov 9 2018, 2:43 PM

Closed by commit rHGdef08813b290: tests: remove obsolete PYTHONPATH override from remotefilelog tests (authored by martinvonz). · Explain WhyNov 9 2018, 3:03 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-remotefilelog-bad-configs.t (3 lines)
M			tests/test-remotefilelog-bgprefetch.t (3 lines)
M			tests/test-remotefilelog-blame.t (3 lines)
M			tests/test-remotefilelog-bundle2-legacy.t (3 lines)
M			tests/test-remotefilelog-bundle2.t (3 lines)
M			tests/test-remotefilelog-bundles.t (3 lines)
M			tests/test-remotefilelog-cacheprocess.t (3 lines)
M			tests/test-remotefilelog-clone-tree.t (3 lines)
M			tests/test-remotefilelog-clone.t (3 lines)
M			tests/test-remotefilelog-corrupt-cache.t (3 lines)
M			tests/test-remotefilelog-gc.t (3 lines)
M			tests/test-remotefilelog-gcrepack.t (3 lines)
M			tests/test-remotefilelog-http.t (3 lines)
M			tests/test-remotefilelog-keepset.t (3 lines)
M			tests/test-remotefilelog-linknodes.t (3 lines)
M			tests/test-remotefilelog-local.t (3 lines)
M			tests/test-remotefilelog-log.t (3 lines)
M			tests/test-remotefilelog-partial-shallow.t (3 lines)
M			tests/test-remotefilelog-permissions.t (3 lines)
M			tests/test-remotefilelog-prefetch.t (3 lines)
M			tests/test-remotefilelog-pull-noshallow.t (3 lines)
M			tests/test-remotefilelog-push-pull.t (3 lines)
M			tests/test-remotefilelog-repack-fast.t (3 lines)
M			tests/test-remotefilelog-repack.t (3 lines)
M			tests/test-remotefilelog-sparse.t (3 lines)
M			tests/test-remotefilelog-tags.t (3 lines)
M			tests/test-remotefilelog-wireproto.t (3 lines)

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Nov 9 2018, 12:27 PM

Status	Author	Revision
Closed	martinvonz	D5253 remotefilelog: avoid accessing repo instance after dispatch
Closed	martinvonz	D5252 share: avoid a now-unnecessary reload of the repo
Closed	martinvonz	D5251 share: reload repo after adjusting it in postshare()
Closed	martinvonz	D5250 tests: don't load strip extension via mq extension for remotefilelog tests
Closed	martinvonz	D5249 remotefilelog: remove unused configs for {data,history}pack version
Closed	martinvonz	D5248 tests: remove obsolete PYTHONPATH override from remotefilelog tests
Closed	martinvonz	D5247 tests: drop obsolete "hginit" alias in remotefilelog tests

Diff 12486

tests/test-remotefilelog-bad-configs.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-bgprefetch.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-blame.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-bundle2-legacy.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	generaldelta to generaldelta interactions with bundle2 but legacy clients			generaldelta to generaldelta interactions with bundle2 but legacy clients
	without changegroup2 support			without changegroup2 support
	$ cat > testcg2.py << EOF			$ cat > testcg2.py << EOF
	> import sys			> import sys
	> from mercurial import changegroup, registrar, util			> from mercurial import changegroup, registrar, util
	> cmdtable = {}			> cmdtable = {}

tests/test-remotefilelog-bundle2.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ grep generaldelta master/.hg/requires			$ grep generaldelta master/.hg/requires
	generaldelta			generaldelta
	$ cd master			$ cd master
	preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones			preferuncompressed = False so that we can make both generaldelta and non-generaldelta clones
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF

tests/test-remotefilelog-bundles.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-cacheprocess.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init repo			$ hg init repo
	$ cd repo			$ cd repo
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-clone-tree.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ echo treemanifest >> .hg/requires			$ echo treemanifest >> .hg/requires
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True

tests/test-remotefilelog-clone.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-corrupt-cache.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-gc.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> serverexpiration=-1			> serverexpiration=-1

tests/test-remotefilelog-gcrepack.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-http.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-keepset.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> serverexpiration=-1			> serverexpiration=-1

tests/test-remotefilelog-linknodes.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	# Tests for the complicated linknode logic in remotefilelog.py::ancestormap()			# Tests for the complicated linknode logic in remotefilelog.py::ancestormap()

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]

tests/test-remotefilelog-local.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-log.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-partial-shallow.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-permissions.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-prefetch.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-pull-noshallow.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	Set up an extension to make sure remotefilelog clientsetup() runs			Set up an extension to make sure remotefilelog clientsetup() runs
	unconditionally even if we have never used a local shallow repo.			unconditionally even if we have never used a local shallow repo.
	This mimics behavior when using remotefilelog with chg. clientsetup() can be			This mimics behavior when using remotefilelog with chg. clientsetup() can be
	triggered due to a shallow repo, and then the code can later interact with			triggered due to a shallow repo, and then the code can later interact with
	non-shallow repositories.			non-shallow repositories.

tests/test-remotefilelog-push-pull.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-repack-fast.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ cat >> $HGRCPATH <<EOF			$ cat >> $HGRCPATH <<EOF
	> [remotefilelog]			> [remotefilelog]
	> fastdatapack=True			> fastdatapack=True
	> EOF			> EOF

	$ hg init master			$ hg init master

tests/test-remotefilelog-repack.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> serverexpiration=-1			> serverexpiration=-1

tests/test-remotefilelog-sparse.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-tags.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

tests/test-remotefilelog-wireproto.t

	$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
	$ export PYTHONPATH

	$ . "$TESTDIR/remotefilelog-library.sh"			$ . "$TESTDIR/remotefilelog-library.sh"

	$ hg init master			$ hg init master
	$ cd master			$ cd master
	$ cat >> .hg/hgrc <<EOF			$ cat >> .hg/hgrc <<EOF
	> [remotefilelog]			> [remotefilelog]
	> server=True			> server=True
	> EOF			> EOF

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	12486		Nov 9 2018, 2:28 PM	★	★
Diff 2	12493	rHGdef08813b29036fa697f8fafb4bd639ac6dfd500	Nov 9 2018, 12:27 PM	★	★