Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: don't drop global hgrc
authorGregory Szorc <gregory.szorc@gmail.com>
Wed, 04 Apr 2018 14:25:20 -0700
changeset 37418 afd7b0afe4a6
parent 37417 76d2115cb817
child 37419 a84b6eeb2c39
tests: don't drop global hgrc 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. Differential Revision: https://phab.mercurial-scm.org/D3098
tests/test-command-template.t file | annotate | diff | comparison | revisions
tests/test-wireproto.t file | annotate | diff | comparison | revisions 
--- a/tests/test-command-template.t	Wed Apr 04 14:11:43 2018 -0700
+++ b/tests/test-command-template.t	Wed Apr 04 14:25:20 2018 -0700
@@ -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}"
--- a/tests/test-wireproto.t	Wed Apr 04 14:11:43 2018 -0700
+++ b/tests/test-wireproto.t	Wed Apr 04 14:25:20 2018 -0700
@@ -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
hg-stable