D5248: tests: remove obsolete PYTHONPATH override from remotefilelog tests
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Nov 9 19:32:17 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5248
AFFECTED FILES
tests/test-remotefilelog-bad-configs.t
tests/test-remotefilelog-bgprefetch.t
tests/test-remotefilelog-blame.t
tests/test-remotefilelog-bundle2-legacy.t
tests/test-remotefilelog-bundle2.t
tests/test-remotefilelog-bundles.t
tests/test-remotefilelog-cacheprocess.t
tests/test-remotefilelog-clone-tree.t
tests/test-remotefilelog-clone.t
tests/test-remotefilelog-corrupt-cache.t
tests/test-remotefilelog-gc.t
tests/test-remotefilelog-gcrepack.t
tests/test-remotefilelog-http.t
tests/test-remotefilelog-keepset.t
tests/test-remotefilelog-linknodes.t
tests/test-remotefilelog-local.t
tests/test-remotefilelog-log.t
tests/test-remotefilelog-partial-shallow.t
tests/test-remotefilelog-permissions.t
tests/test-remotefilelog-prefetch.t
tests/test-remotefilelog-pull-noshallow.t
tests/test-remotefilelog-push-pull.t
tests/test-remotefilelog-repack-fast.t
tests/test-remotefilelog-repack.t
tests/test-remotefilelog-sparse.t
tests/test-remotefilelog-tags.t
tests/test-remotefilelog-wireproto.t
CHANGE DETAILS
diff --git a/tests/test-remotefilelog-wireproto.t b/tests/test-remotefilelog-wireproto.t
--- a/tests/test-remotefilelog-wireproto.t
+++ b/tests/test-remotefilelog-wireproto.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-tags.t b/tests/test-remotefilelog-tags.t
--- a/tests/test-remotefilelog-tags.t
+++ b/tests/test-remotefilelog-tags.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-sparse.t b/tests/test-remotefilelog-sparse.t
--- a/tests/test-remotefilelog-sparse.t
+++ b/tests/test-remotefilelog-sparse.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-repack.t b/tests/test-remotefilelog-repack.t
--- a/tests/test-remotefilelog-repack.t
+++ b/tests/test-remotefilelog-repack.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-repack-fast.t b/tests/test-remotefilelog-repack-fast.t
--- a/tests/test-remotefilelog-repack-fast.t
+++ b/tests/test-remotefilelog-repack-fast.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ cat >> $HGRCPATH <<EOF
diff --git a/tests/test-remotefilelog-push-pull.t b/tests/test-remotefilelog-push-pull.t
--- a/tests/test-remotefilelog-push-pull.t
+++ b/tests/test-remotefilelog-push-pull.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-pull-noshallow.t b/tests/test-remotefilelog-pull-noshallow.t
--- a/tests/test-remotefilelog-pull-noshallow.t
+++ b/tests/test-remotefilelog-pull-noshallow.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
Set up an extension to make sure remotefilelog clientsetup() runs
diff --git a/tests/test-remotefilelog-prefetch.t b/tests/test-remotefilelog-prefetch.t
--- a/tests/test-remotefilelog-prefetch.t
+++ b/tests/test-remotefilelog-prefetch.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-permissions.t b/tests/test-remotefilelog-permissions.t
--- a/tests/test-remotefilelog-permissions.t
+++ b/tests/test-remotefilelog-permissions.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-partial-shallow.t b/tests/test-remotefilelog-partial-shallow.t
--- a/tests/test-remotefilelog-partial-shallow.t
+++ b/tests/test-remotefilelog-partial-shallow.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-log.t b/tests/test-remotefilelog-log.t
--- a/tests/test-remotefilelog-log.t
+++ b/tests/test-remotefilelog-log.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-local.t b/tests/test-remotefilelog-local.t
--- a/tests/test-remotefilelog-local.t
+++ b/tests/test-remotefilelog-local.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-linknodes.t b/tests/test-remotefilelog-linknodes.t
--- a/tests/test-remotefilelog-linknodes.t
+++ b/tests/test-remotefilelog-linknodes.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
# Tests for the complicated linknode logic in remotefilelog.py::ancestormap()
$ . "$TESTDIR/remotefilelog-library.sh"
diff --git a/tests/test-remotefilelog-keepset.t b/tests/test-remotefilelog-keepset.t
--- a/tests/test-remotefilelog-keepset.t
+++ b/tests/test-remotefilelog-keepset.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-http.t b/tests/test-remotefilelog-http.t
--- a/tests/test-remotefilelog-http.t
+++ b/tests/test-remotefilelog-http.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-gcrepack.t b/tests/test-remotefilelog-gcrepack.t
--- a/tests/test-remotefilelog-gcrepack.t
+++ b/tests/test-remotefilelog-gcrepack.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-gc.t b/tests/test-remotefilelog-gc.t
--- a/tests/test-remotefilelog-gc.t
+++ b/tests/test-remotefilelog-gc.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-corrupt-cache.t b/tests/test-remotefilelog-corrupt-cache.t
--- a/tests/test-remotefilelog-corrupt-cache.t
+++ b/tests/test-remotefilelog-corrupt-cache.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-clone.t b/tests/test-remotefilelog-clone.t
--- a/tests/test-remotefilelog-clone.t
+++ b/tests/test-remotefilelog-clone.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-clone-tree.t b/tests/test-remotefilelog-clone-tree.t
--- a/tests/test-remotefilelog-clone-tree.t
+++ b/tests/test-remotefilelog-clone-tree.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-cacheprocess.t b/tests/test-remotefilelog-cacheprocess.t
--- a/tests/test-remotefilelog-cacheprocess.t
+++ b/tests/test-remotefilelog-cacheprocess.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init repo
diff --git a/tests/test-remotefilelog-bundles.t b/tests/test-remotefilelog-bundles.t
--- a/tests/test-remotefilelog-bundles.t
+++ b/tests/test-remotefilelog-bundles.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-bundle2.t b/tests/test-remotefilelog-bundle2.t
--- a/tests/test-remotefilelog-bundle2.t
+++ b/tests/test-remotefilelog-bundle2.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-bundle2-legacy.t b/tests/test-remotefilelog-bundle2-legacy.t
--- a/tests/test-remotefilelog-bundle2-legacy.t
+++ b/tests/test-remotefilelog-bundle2-legacy.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
generaldelta to generaldelta interactions with bundle2 but legacy clients
diff --git a/tests/test-remotefilelog-blame.t b/tests/test-remotefilelog-blame.t
--- a/tests/test-remotefilelog-blame.t
+++ b/tests/test-remotefilelog-blame.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-bgprefetch.t b/tests/test-remotefilelog-bgprefetch.t
--- a/tests/test-remotefilelog-bgprefetch.t
+++ b/tests/test-remotefilelog-bgprefetch.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
diff --git a/tests/test-remotefilelog-bad-configs.t b/tests/test-remotefilelog-bad-configs.t
--- a/tests/test-remotefilelog-bad-configs.t
+++ b/tests/test-remotefilelog-bad-configs.t
@@ -1,6 +1,3 @@
- $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
- $ export PYTHONPATH
-
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list