Mercurial > hg-stable

changeset 28610:3aa50c9d89a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make config/help tests pass even if chgserver extension is loaded It isn't important for these tests if "extensions.chgserver=" is set or not. So let's make them ignore such lines.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 20 Mar 2016 12:25:46 -0700
parents c11f0992d124
children 6aa17f86d9f0
files tests/test-basic.t tests/test-help.t tests/test-hgrc.t
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-basic.t	Tue Mar 22 16:05:22 2016 -0700
+++ b/tests/test-basic.t	Sun Mar 20 12:25:46 2016 -0700
@@ -6,6 +6,7 @@
   defaults.shelve=--date "0 0"
   defaults.tag=-d "0 0"
   devel.all-warnings=true
+  extensions.chgserver= (?)
   largefiles.usercache=$TESTTMP/.cache/largefiles (glob)
   ui.slash=True
   ui.interactive=False
--- a/tests/test-help.t	Tue Mar 22 16:05:22 2016 -0700
+++ b/tests/test-help.t	Sun Mar 20 12:25:46 2016 -0700
@@ -241,6 +241,7 @@
   
       enabled extensions:
   
+       chgserver     command server extension for cHg (EXPERIMENTAL) (?)
        children      command to display child changesets (DEPRECATED)
        rebase        command to move sets of revisions to a different ancestor
   
--- a/tests/test-hgrc.t	Tue Mar 22 16:05:22 2016 -0700
+++ b/tests/test-hgrc.t	Sun Mar 20 12:25:46 2016 -0700
@@ -46,6 +46,7 @@
   default = $TESTTMP/foo%bar (glob)
   $ hg showconfig
   bundle.mainreporoot=$TESTTMP/foobar (glob)
+  extensions.chgserver= (?)
   paths.default=$TESTTMP/foo%bar (glob)
   $ cd ..
 
@@ -80,6 +81,7 @@
 
   $ hg showconfig --config ui.verbose=True --quiet
   bundle.mainreporoot=$TESTTMP
+  extensions.chgserver= (?)
   ui.verbose=False
   ui.debug=False
   ui.quiet=True
@@ -111,6 +113,7 @@
 
   $ hg showconfig
   bundle.mainreporoot=$TESTTMP
+  extensions.chgserver= (?)
   ui.username=$FAKEUSER
 
   $ unset FAKEUSER
@@ -156,6 +159,7 @@
   $TESTTMP/hgrc:13: alias.log=log -g
   repo: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:11: defaults.identify=-n
+  --config: extensions.chgserver= (?)
   $TESTTMP/hgrc:2: ui.debug=true
   $TESTTMP/hgrc:3: ui.fallbackencoding=ASCII
   $TESTTMP/hgrc:4: ui.quiet=true
@@ -171,6 +175,7 @@
   $ hg showconfig --config ui.traceback=True --debug
   read config from: $TESTTMP/hgrc
   repo: bundle.mainreporoot=$TESTTMP
+  --config: extensions.chgserver= (?)
   --config: ui.traceback=True
   --verbose: ui.verbose=False
   --debug: ui.debug=True
@@ -190,6 +195,7 @@
   read config from: $TESTTMP/hgrc
   repo: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
+  --config: extensions.chgserver= (?)
   --config: ui.traceback=True
   --verbose: ui.verbose=False
   --debug: ui.debug=True
@@ -200,6 +206,7 @@
   read config from: $TESTTMP/hgrc
   repo: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
+  --config: extensions.chgserver= (?)
   --config: ui.traceback=True
   --verbose: ui.verbose=False
   --debug: ui.debug=True
@@ -210,6 +217,7 @@
   read config from: $TESTTMP/hgrc
   repo: bundle.mainreporoot=$TESTTMP
   $TESTTMP/hgrc:15: extensions.plain=./plain.py
+  --config: extensions.chgserver= (?)
   --config: ui.traceback=True
   --verbose: ui.verbose=False
   --debug: ui.debug=True