codemod: drop hacks changing PYTHONPATH in tests

Summary: Now they are unnecessary since `run-tests.py` will set up `PYTONPATH` correctly. Differential Revision: D6865042 fbshipit-source-id: ca95314f725968e14349a9d916434aa832c596f9
2025-01-08 14:46:47 +03:00 · 2018-01-31 16:47:34 -08:00 · 2018-01-31 16:47:34 -08:00 · 1cde63d99c
commit 1cde63d99c
parent d61006b81f
92 changed files with 19 additions and 236 deletions
--- a/tests/test-check-code.t
+++ b/tests/test-check-code.t
@ -167,9 +167,6 @@ New errors are not allowed. Warnings are strongly discouraged.
  Skipping tests/comprehensive/test-hgsubversion-verify-and-startrev.py it has no-che?k-code (glob)
  Skipping tests/conduithttp.py it has no-che?k-code (glob)
  Skipping tests/fixtures/rsvn.py it has no-che?k-code (glob)
-  tests/test-fb-hgext-myparent.t:56:
-   >   $ hg help templates | grep -A2 myparent
-   don't use grep's context flags
  Skipping tests/test-fb-hgext-remotefilelog-bad-configs.t it has no-che?k-code (glob)
  tests/test-hggit-git-submodules.t:61:
   >   $ grep 'submodule "subrepo2"' -A2 .gitmodules > .gitmodules-new
--- a/tests/test-check-execute.t
+++ b/tests/test-check-execute.t
@ -1,4 +1,4 @@
-#require test-repo execbit hg10
+#require test-repo execbit hg10 slow

  $ . "$TESTDIR/helpers-testrepo.sh"
  $ cd "`dirname "$TESTDIR"`"
--- a/tests/test-check-module-imports.t
+++ b/tests/test-check-module-imports.t
@ -291,24 +291,20 @@ outputs, which should be fixed later.
  hgext/tweakdefaults.py:1058: multiple imported names: msvcrt, _subprocess
  hgext/undo.py:39: symbol import follows non-symbol import: mercurial.node
  tests/getflogheads.py:3: symbol import follows non-symbol import: mercurial.i18n
-  tests/test-fb-hgext-cstore-datapackstore.py:17: imports not lexically sorted: pythonpath < silenttestrunner
-  tests/test-fb-hgext-cstore-datapackstore.py:20: direct symbol import datapackstore from hgext.extlib.cstore
-  tests/test-fb-hgext-cstore-datapackstore.py:24: direct symbol import fastdatapack, mutabledatapack from hgext.remotefilelog.datapack
-  tests/test-fb-hgext-cstore-datapackstore.py:30: imports not lexically sorted: mercurial.ui < pythonpath
-  tests/test-fb-hgext-cstore-uniondatapackstore.py:16: imports not lexically sorted: pythonpath < silenttestrunner
-  tests/test-fb-hgext-cstore-uniondatapackstore.py:19: direct symbol import datapackstore, uniondatapackstore from hgext.extlib.cstore
-  tests/test-fb-hgext-cstore-uniondatapackstore.py:24: direct symbol import datapack, mutabledatapack from hgext.remotefilelog.datapack
-  tests/test-fb-hgext-cstore-uniondatapackstore.py:30: symbol import follows non-symbol import: mercurial.node
-  tests/test-fb-hgext-cstore-uniondatapackstore.py:31: imports not lexically sorted: mercurial.ui < pythonpath
-  tests/test-fb-hgext-remotefilelog-datapack.py:19: imports not lexically sorted: pythonpath < silenttestrunner
-  tests/test-fb-hgext-remotefilelog-datapack.py:22: direct symbol import datapack, datapackstore, fastdatapack, mutabledatapack from hgext.remotefilelog.datapack
-  tests/test-fb-hgext-remotefilelog-datapack.py:28: direct symbol import SMALLFANOUTCUTOFF, SMALLFANOUTPREFIX, LARGEFANOUTPREFIX from hgext.remotefilelog.basepack
-  tests/test-fb-hgext-remotefilelog-datapack.py:28: imports from hgext.remotefilelog.basepack not lexically sorted: LARGEFANOUTPREFIX < SMALLFANOUTPREFIX
-  tests/test-fb-hgext-remotefilelog-datapack.py:35: symbol import follows non-symbol import: mercurial.node
-  tests/test-fb-hgext-remotefilelog-datapack.py:36: imports not lexically sorted: mercurial.ui < pythonpath
-  tests/test-fb-hgext-remotefilelog-histpack.py:18: imports not lexically sorted: pythonpath < silenttestrunner
-  tests/test-fb-hgext-remotefilelog-histpack.py:21: direct symbol import historypack, mutablehistorypack from hgext.remotefilelog.historypack
-  tests/test-fb-hgext-remotefilelog-histpack.py:24: imports not lexically sorted: mercurial.ui < pythonpath
-  tests/test-fb-hgext-remotefilelog-histpack.py:26: direct symbol import SMALLFANOUTCUTOFF, LARGEFANOUTPREFIX from hgext.remotefilelog.basepack
-  tests/test-fb-hgext-remotefilelog-histpack.py:26: imports from hgext.remotefilelog.basepack not lexically sorted: LARGEFANOUTPREFIX < SMALLFANOUTCUTOFF
+  tests/test-fb-hgext-cstore-datapackstore.py:13: direct symbol import datapackstore from hgext.extlib.cstore
+  tests/test-fb-hgext-cstore-datapackstore.py:17: direct symbol import fastdatapack, mutabledatapack from hgext.remotefilelog.datapack
+  tests/test-fb-hgext-cstore-datapackstore.py:23: imports not lexically sorted: mercurial.ui < silenttestrunner
+  tests/test-fb-hgext-cstore-uniondatapackstore.py:12: direct symbol import datapackstore, uniondatapackstore from hgext.extlib.cstore
+  tests/test-fb-hgext-cstore-uniondatapackstore.py:17: direct symbol import datapack, mutabledatapack from hgext.remotefilelog.datapack
+  tests/test-fb-hgext-cstore-uniondatapackstore.py:23: symbol import follows non-symbol import: mercurial.node
+  tests/test-fb-hgext-cstore-uniondatapackstore.py:24: imports not lexically sorted: mercurial.ui < silenttestrunner
+  tests/test-fb-hgext-remotefilelog-datapack.py:16: direct symbol import datapack, datapackstore, fastdatapack, mutabledatapack from hgext.remotefilelog.datapack
+  tests/test-fb-hgext-remotefilelog-datapack.py:22: direct symbol import SMALLFANOUTCUTOFF, SMALLFANOUTPREFIX, LARGEFANOUTPREFIX from hgext.remotefilelog.basepack
+  tests/test-fb-hgext-remotefilelog-datapack.py:22: imports from hgext.remotefilelog.basepack not lexically sorted: LARGEFANOUTPREFIX < SMALLFANOUTPREFIX
+  tests/test-fb-hgext-remotefilelog-datapack.py:29: symbol import follows non-symbol import: mercurial.node
+  tests/test-fb-hgext-remotefilelog-datapack.py:30: imports not lexically sorted: mercurial.ui < silenttestrunner
+  tests/test-fb-hgext-remotefilelog-histpack.py:15: direct symbol import historypack, mutablehistorypack from hgext.remotefilelog.historypack
+  tests/test-fb-hgext-remotefilelog-histpack.py:18: imports not lexically sorted: mercurial.ui < silenttestrunner
+  tests/test-fb-hgext-remotefilelog-histpack.py:20: direct symbol import SMALLFANOUTCUTOFF, LARGEFANOUTPREFIX from hgext.remotefilelog.basepack
+  tests/test-fb-hgext-remotefilelog-histpack.py:20: imports from hgext.remotefilelog.basepack not lexically sorted: LARGEFANOUTPREFIX < SMALLFANOUTCUTOFF
  [1]
--- a/tests/test-check-shbang.t
+++ b/tests/test-check-shbang.t
@ -1,4 +1,4 @@
-#require test-repo hg10
+#require test-repo hg10 slow

  $ . "$TESTDIR/helpers-testrepo.sh"
  $ cd "`dirname "$TESTDIR"`"
--- a/tests/test-fb-hgext-absorb-edit-lines.t
+++ b/tests/test-fb-hgext-absorb-edit-lines.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-absorb-rename.t
+++ b/tests/test-fb-hgext-absorb-rename.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [diff]
--- a/tests/test-fb-hgext-absorb.t
+++ b/tests/test-fb-hgext-absorb.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-cstore-datapackstore.py
+++ b/tests/test-fb-hgext-cstore-datapackstore.py
@ -2,21 +2,14 @@
 from __future__ import absolute_import

 import hashlib
-import os
 import random
 import shutil
-import sys
 import tempfile
 import time
 import unittest

 import silenttestrunner

-# Load the local cstore, not the system one
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
-import pythonpath
-pythonpath.setcstorepath()
-
 from hgext.extlib.cstore import (
    datapackstore,
 )
--- a/tests/test-fb-hgext-cstore-treemanifest.py
+++ b/tests/test-fb-hgext-cstore-treemanifest.py
@ -1,16 +1,9 @@
 #!/usr/bin/env python2.7
 from __future__ import absolute_import

-import os
 import random
-import sys
 import unittest

-# Add the repo root to the path so we can find the built ctreemanifest
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
-import pythonpath
-pythonpath.setcstorepath()
-
 from mercurial.node import hex, nullid

 import silenttestrunner
--- a/tests/test-fb-hgext-cstore-uniondatapackstore.py
+++ b/tests/test-fb-hgext-cstore-uniondatapackstore.py
@ -2,20 +2,13 @@
 from __future__ import absolute_import

 import hashlib
-import os
 import random
 import shutil
-import sys
 import tempfile
 import unittest

 import silenttestrunner

-# Load the local cstore, not the system one
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
-import pythonpath
-pythonpath.setcstorepath()
-
 from hgext.extlib.cstore import (
    datapackstore,
    uniondatapackstore,
--- a/tests/test-fb-hgext-diff-since-last-arc-diff.t
+++ b/tests/test-fb-hgext-diff-since-last-arc-diff.t
@ -1,7 +1,5 @@
 Load extensions

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > arcconfig=$TESTDIR/../hgext/extlib/phabricator/arcconfig.py
--- a/tests/test-fb-hgext-fastannotate-corrupt.t
+++ b/tests/test-fb-hgext-fastannotate-corrupt.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastannotate-diffopts.t
+++ b/tests/test-fb-hgext-fastannotate-diffopts.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastannotate-hg.t
+++ b/tests/test-fb-hgext-fastannotate-hg.t
@ -1,7 +1,5 @@
 (this file is backported from core hg tests/test-annotate.t)

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

  $ cat >> $HGRCPATH << EOF
  > [diff]
--- a/tests/test-fb-hgext-fastannotate-perfhack.t
+++ b/tests/test-fb-hgext-fastannotate-perfhack.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastannotate-protocol.t
+++ b/tests/test-fb-hgext-fastannotate-protocol.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [ui]
--- a/tests/test-fb-hgext-fastannotate-remotefilelog.t
+++ b/tests/test-fb-hgext-fastannotate-remotefilelog.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastannotate-renames.t
+++ b/tests/test-fb-hgext-fastannotate-renames.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastannotate.t
+++ b/tests/test-fb-hgext-fastannotate.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastmanifest-access.t
+++ b/tests/test-fb-hgext-fastmanifest-access.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest-blackbox.t
+++ b/tests/test-fb-hgext-fastmanifest-blackbox.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest-concurrency.t
+++ b/tests/test-fb-hgext-fastmanifest-concurrency.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest-permission.t
+++ b/tests/test-fb-hgext-fastmanifest-permission.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest-pruning.t
+++ b/tests/test-fb-hgext-fastmanifest-pruning.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest-readfast.t
+++ b/tests/test-fb-hgext-fastmanifest-readfast.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH << EOF
  > [extensions]
--- a/tests/test-fb-hgext-fastmanifest-remotenames.t
+++ b/tests/test-fb-hgext-fastmanifest-remotenames.t
@ -2,8 +2,6 @@

 Setup

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

  $ mkcommit() {
  >    echo "$1" > "$1"
--- a/tests/test-fb-hgext-fastmanifest-writepath.t
+++ b/tests/test-fb-hgext-fastmanifest-writepath.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fastmanifest.t
+++ b/tests/test-fb-hgext-fastmanifest.t
@ -1,7 +1,5 @@
 Setup

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

 Check diagnosis, debugging information
 1) Setup configuration
--- a/tests/test-fb-hgext-fbhistedit-stop.t
+++ b/tests/test-fb-hgext-fbhistedit-stop.t
@ -2,8 +2,6 @@

 Setup

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

  $ cat >> $HGRCPATH <<EOF
  > [extensions]
--- a/tests/test-fb-hgext-grepdiff.t
+++ b/tests/test-fb-hgext-grepdiff.t
@ -1,4 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
  $ echo "[extensions]" >> $HGRCPATH
  $ echo "grepdiff=" >> $HGRCPATH

--- a/tests/test-fb-hgext-myparent.t
+++ b/tests/test-fb-hgext-myparent.t
@ -1,7 +1,5 @@
 Setup

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > myparent=
@ -53,22 +51,9 @@ If the authors do not match the keywords will be empty.

 Make sure the template keywords are documented correctly

-  $ hg help templates | grep -A2 myparent
+  $ hg help templates | grep myparent
      myparentdiff  Show the differential revision of the commit's parent, if it
-                    has the same author as this commit.
-  -- (?)
      myparentreviewers
-                    Show the reviewers of the commit's parent, if it has the
-                    same author as this commit.
-  -- (?)
      myparentsubscribers
-                    Show the subscribers of the commit's parent, if it has the
-                    same author as this commit.
-  -- (?)
      myparenttasks
-                    Show the tasks from the commit's parent, if it has the same
-                    author as this commit.
-  -- (?)
      myparenttitleprefix
-                    Show the title prefix of the commit's parent, if it has the
-                    same author as this commit.
--- a/tests/test-fb-hgext-obsshelve.t
+++ b/tests/test-fb-hgext-obsshelve.t
@ -1,7 +1,5 @@
  $ . helpers-usechg.sh

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

  $ cat <<EOF >> $HGRCPATH
  > [extensions]
--- a/tests/test-fb-hgext-perftweaks.t
+++ b/tests/test-fb-hgext-perftweaks.t
@ -168,8 +168,6 @@ We need to disable the SCM_SAMPLING_FILEPATH env var because arcanist may set it
  > [extensions]
  > sampling=
  > EOF
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ unset SCM_SAMPLING_FILEPATH
  $ hg status
  >>> import json
--- a/tests/test-fb-hgext-phabdiff.t
+++ b/tests/test-fb-hgext-phabdiff.t
@ -1,4 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
  $ echo "[extensions]" >> $HGRCPATH
  $ echo "phabdiff=" >> $HGRCPATH

--- a/tests/test-fb-hgext-phabstatus.t
+++ b/tests/test-fb-hgext-phabstatus.t
@ -1,7 +1,5 @@
 Setup

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > arcconfig=$TESTDIR/../hgext/extlib/phabricator/arcconfig.py
--- a/tests/test-fb-hgext-progressfile.t
+++ b/tests/test-fb-hgext-progressfile.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat > loop.py <<EOF
  > from mercurial import commands, registrar
--- a/tests/test-fb-hgext-pull-createmarkers-hide-later.t
+++ b/tests/test-fb-hgext-pull-createmarkers-hide-later.t
@ -2,8 +2,6 @@

 Setup

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

 Test that hg pull creates obsolescence markers for landed diffs
  $ cat >> $HGRCPATH <<EOF
--- a/tests/test-fb-hgext-pull-createmarkers.t
+++ b/tests/test-fb-hgext-pull-createmarkers.t
@ -2,8 +2,6 @@

 Setup

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

 Test that hg pull creates obsolescence markers for landed diffs
  $ cat >> $HGRCPATH <<EOF
--- a/tests/test-fb-hgext-pushrebase-protection.t
+++ b/tests/test-fb-hgext-pushrebase-protection.t
@ -1,7 +1,5 @@
 Setup

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

  $ cat >> $HGRCPATH <<EOF
  > [ui]
--- a/tests/test-fb-hgext-pushrebase-remotenames.t
+++ b/tests/test-fb-hgext-pushrebase-remotenames.t
@ -2,8 +2,6 @@

 Setup

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

  $ cat >> $HGRCPATH << EOF
  > [ui]
--- a/tests/test-fb-hgext-pushrebase.t
+++ b/tests/test-fb-hgext-pushrebase.t
@ -2,8 +2,6 @@

 Setup

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

  $ cat >> $HGRCPATH <<EOF
  > [ui]
--- a/tests/test-fb-hgext-pushvars-remotenames.t
+++ b/tests/test-fb-hgext-pushvars-remotenames.t
@ -2,8 +2,6 @@

 Setup

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

  $ cat > $TESTTMP/pretxnchangegroup.sh << EOF
  > #!/bin/sh
--- a/tests/test-fb-hgext-remotefilelog-bad-configs.t
+++ b/tests/test-fb-hgext-remotefilelog-bad-configs.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

 no-check-code
  $ . "$TESTDIR/library.sh"
--- a/tests/test-fb-hgext-remotefilelog-bgprefetch.t
+++ b/tests/test-fb-hgext-remotefilelog-bgprefetch.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-blame.t
+++ b/tests/test-fb-hgext-remotefilelog-blame.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-bundle2-legacy.t
+++ b/tests/test-fb-hgext-remotefilelog-bundle2-legacy.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-bundle2.t
+++ b/tests/test-fb-hgext-remotefilelog-bundle2.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-bundles.t
+++ b/tests/test-fb-hgext-remotefilelog-bundles.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-cacheprocess.t
+++ b/tests/test-fb-hgext-remotefilelog-cacheprocess.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-clone-tree.t
+++ b/tests/test-fb-hgext-remotefilelog-clone-tree.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-clone.t
+++ b/tests/test-fb-hgext-remotefilelog-clone.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-corrupt-cache.t
+++ b/tests/test-fb-hgext-remotefilelog-corrupt-cache.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-datapack.py
+++ b/tests/test-fb-hgext-remotefilelog-datapack.py
@ -7,18 +7,12 @@ import random
 import shutil
 import stat
 import struct
-import sys
 import tempfile
 import time
 import unittest

 import silenttestrunner

-# Load the local remotefilelog, not the system one
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
-import pythonpath
-pythonpath.setcstorepath()
-
 from hgext.remotefilelog.datapack import (
    datapack,
    datapackstore,
--- a/tests/test-fb-hgext-remotefilelog-gc.t
+++ b/tests/test-fb-hgext-remotefilelog-gc.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-gcrepack.t
+++ b/tests/test-fb-hgext-remotefilelog-gcrepack.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-histpack.py
+++ b/tests/test-fb-hgext-remotefilelog-histpack.py
@ -7,17 +7,11 @@ import random
 import shutil
 import stat
 import struct
-import sys
 import tempfile
 import unittest

 import silenttestrunner

-# Load the local remotefilelog, not the system one
-sys.path[0:0] = [os.path.join(os.path.dirname(__file__), '..')]
-import pythonpath
-pythonpath.setcstorepath()
-
 from hgext.remotefilelog.historypack import historypack, mutablehistorypack

 from mercurial.node import nullid
--- a/tests/test-fb-hgext-remotefilelog-http.t
+++ b/tests/test-fb-hgext-remotefilelog-http.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-keepset.t
+++ b/tests/test-fb-hgext-remotefilelog-keepset.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t
+++ b/tests/test-fb-hgext-remotefilelog-lfs-prefetch.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ LFSPATH=$TESTTMP/lfs
  $ export LFSPATH
  $ mkdir $LFSPATH
--- a/tests/test-fb-hgext-remotefilelog-lfs.t
+++ b/tests/test-fb-hgext-remotefilelog-lfs.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-linknodes.t
+++ b/tests/test-fb-hgext-remotefilelog-linknodes.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

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

--- a/tests/test-fb-hgext-remotefilelog-local.t
+++ b/tests/test-fb-hgext-remotefilelog-local.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-log.t
+++ b/tests/test-fb-hgext-remotefilelog-log.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-partial-shallow.t
+++ b/tests/test-fb-hgext-remotefilelog-partial-shallow.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-permissions.t
+++ b/tests/test-fb-hgext-remotefilelog-permissions.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-prefetch.t
+++ b/tests/test-fb-hgext-remotefilelog-prefetch.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-pull-noshallow.t
+++ b/tests/test-fb-hgext-remotefilelog-pull-noshallow.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-push-pull.t
+++ b/tests/test-fb-hgext-remotefilelog-push-pull.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-repack-fast.t
+++ b/tests/test-fb-hgext-remotefilelog-repack-fast.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-repack.t
+++ b/tests/test-fb-hgext-remotefilelog-repack.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-sparse.t
+++ b/tests/test-fb-hgext-remotefilelog-sparse.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-tags.t
+++ b/tests/test-fb-hgext-remotefilelog-tags.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-treemanifest.t
+++ b/tests/test-fb-hgext-remotefilelog-treemanifest.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remotefilelog-wireproto.t
+++ b/tests/test-fb-hgext-remotefilelog-wireproto.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-remoteid-print.t
+++ b/tests/test-fb-hgext-remoteid-print.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-sampling.t
+++ b/tests/test-fb-hgext-sampling.t
@ -2,8 +2,6 @@ Setup. SCM_SAMPLING_FILEPATH needs to be cleared as some environments may
 have it set.

  $ unset SCM_SAMPLING_FILEPATH
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ mkcommit() {
  >    echo "$1" > "$1"
--- a/tests/test-fb-hgext-sigtrace.t
+++ b/tests/test-fb-hgext-sigtrace.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/../:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $TESTTMP/signal.py << EOF
  > from mercurial import registrar
--- a/tests/test-fb-hgext-syncstatus.t
+++ b/tests/test-fb-hgext-syncstatus.t
@ -1,7 +1,5 @@
 Setup

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH << EOF
  > [extensions]
  > arcconfig=$TESTDIR/../hgext/extlib/phabricator/arcconfig.py
--- a/tests/test-fb-hgext-treemanifest-autoconvert.t
+++ b/tests/test-fb-hgext-treemanifest-autoconvert.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

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

  $ hginit master
  $ cd master
--- a/tests/test-fb-hgext-treemanifest-backfill.t
+++ b/tests/test-fb-hgext-treemanifest-backfill.t
@ -1,6 +1,4 @@
  $ CACHEDIR=`pwd`/hgcache
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ hg init master
  $ cd master
--- a/tests/test-fb-hgext-treemanifest-blame.t
+++ b/tests/test-fb-hgext-treemanifest-blame.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH <<EOF
  > [treemanifest]
  > sendtrees=True
--- a/tests/test-fb-hgext-treemanifest-disabled.t
+++ b/tests/test-fb-hgext-treemanifest-disabled.t
@ -1,6 +1,4 @@
  $ CACHEDIR=`pwd`/hgcache
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-treemanifest-fastmanifest.t
+++ b/tests/test-fb-hgext-treemanifest-fastmanifest.t
@ -2,8 +2,6 @@

  $ . "$TESTDIR/library.sh"

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

  $ cat >> $TESTTMP/flatcheck.py <<EOF
  > import sys, traceback
--- a/tests/test-fb-hgext-treemanifest-infinitepush.t
+++ b/tests/test-fb-hgext-treemanifest-infinitepush.t
@ -1,8 +1,6 @@
  $ . "$TESTDIR/library.sh"
  $ . "$TESTDIR/infinitepush/library.sh"

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

  $ hginit master
--- a/tests/test-fb-hgext-treemanifest-noflat.t
+++ b/tests/test-fb-hgext-treemanifest-noflat.t
@ -2,8 +2,6 @@

 This file tests that normal mercurial operations almost never read the flat manifests

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

  $ cat >> $TESTTMP/flatcheck.py <<EOF
  > import sys, traceback
--- a/tests/test-fb-hgext-treemanifest-peertopeer.t
+++ b/tests/test-fb-hgext-treemanifest-peertopeer.t
@ -1,6 +1,4 @@
  $ CACHEDIR=`pwd`/hgcache
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ cat >> $HGRCPATH <<EOF
  > [treemanifest]
--- a/tests/test-fb-hgext-treemanifest-prefetch.t
+++ b/tests/test-fb-hgext-treemanifest-prefetch.t
@ -16,8 +16,6 @@ There are three cases which are of interest in this test:
 #testcases remotefilelog.true.shallowrepo.true remotefilelog.true.shallowrepo.false remotefilelog.false

  $ CACHEDIR=`pwd`/hgcache
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-treemanifest-pushrebase.t
+++ b/tests/test-fb-hgext-treemanifest-pushrebase.t
@ -1,5 +1,3 @@
-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH

  $ . "$TESTDIR/library.sh"

--- a/tests/test-fb-hgext-treemanifest-repack.t
+++ b/tests/test-fb-hgext-treemanifest-repack.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

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

  $ hg init master
  $ hg clone -q ssh://user@dummy/master client
--- a/tests/test-fb-hgext-treemanifest-server.t
+++ b/tests/test-fb-hgext-treemanifest-server.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

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

 - Disable simplecache since it can cause certain reads to not actually hit the
 - ondisk structures.
--- a/tests/test-fb-hgext-treemanifest-treeonly.t
+++ b/tests/test-fb-hgext-treemanifest-treeonly.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

-  $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
-  $ export PYTHONPATH
  $ cat >> $HGRCPATH <<EOF
  > [treemanifest]
  > sendtrees=True
--- a/tests/test-fb-hgext-treemanifest.t
+++ b/tests/test-fb-hgext-treemanifest.t
@ -1,7 +1,5 @@
  $ . "$TESTDIR/library.sh"

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

  $ hginit master
  $ cd master