Patchwork D3098: tests: don't drop global hgrc

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 1:25 a.m.
Message ID <differential-rev-PHID-DREV-mos4xlcttyl3acawnael-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30324/
State Superseded
Headers show

Comments

phabricator - April 5, 2018, 1:25 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Various tests are failing when the simple store extension is loaded
  because the test overrides HGRCPATH and preempts loading of extensions
  that were injected via --extra-config-opt.
  
  In most cases, it is acceptable to always load the global HGRCPATH.
  So this commit changes a couple of tests so the global HGRCPATH
  is still pulled in.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3098

AFFECTED FILES
  tests/test-command-template.t
  tests/test-wireproto.t

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -114,10 +114,7 @@ 
 
 HTTP without the httpheader capability:
 
-  $ HGRCPATH="`pwd`/repo/.hgrc"
-  $ export HGRCPATH
-  $ CAP=httpheader
-  $ . "$TESTDIR/notcapable"
+  $ CAP=httpheader . "$TESTDIR/notcapable"
 
   $ hg serve -R repo -p $HGPORT2 -d --pid-file=hg2.pid -E error2.log -A access2.log
   $ cat hg2.pid >> $DAEMON_PIDS
diff --git a/tests/test-command-template.t b/tests/test-command-template.t
--- a/tests/test-command-template.t
+++ b/tests/test-command-template.t
@@ -284,7 +284,8 @@ 
 
  so it can be included in hgrc
 
-  $ cat <<'EOF' > myhgrc
+  $ cat <<EOF > myhgrc
+  > %include $HGRCPATH
   > %include map-simple
   > [templates]
   > foo = "{changeset}"