changeset 39149:f2e645dc6a67

tests: conditionalize extension tests for extra extensions If extra extensions are loaded (e.g. via --extra-config-opt), the tests conditionalized in this commit fail in ways that are dependent on the extensions that are loaded. So let's skip them when that scenario is present. This drops the number of failures for the simplestorerepo.py extension to 4. Differential Revision: https://phab.mercurial-scm.org/D4285
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 16 Aug 2018 00:11:35 +0000
parents 46da52f4b820
children e8532d00b729
files tests/test-bad-extension.t tests/test-extension.t
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-bad-extension.t	Sat Jul 07 22:40:39 2018 +0900
+++ b/tests/test-bad-extension.t	Thu Aug 16 00:11:35 2018 +0000
@@ -72,6 +72,7 @@
   $ hg --config extensions.badexts=showbadexts.py showbadexts 2>&1 | grep '^BADEXTS'
   BADEXTS: badext badext2
 
+#if no-extraextensions
 show traceback for ImportError of hgext.name if devel.debug.extensions is set
 
   $ (hg help help --traceback --debug --config devel.debug.extensions=yes 2>&1) \
@@ -120,6 +121,7 @@
   debug.extensions: - loading extension registration objects
   debug.extensions: > extension registration object loading took * (glob)
   debug.extensions: extension loading complete
+#endif
 
 confirm that there's no crash when an extension's documentation is bad
 
--- a/tests/test-extension.t	Sat Jul 07 22:40:39 2018 +0900
+++ b/tests/test-extension.t	Thu Aug 16 00:11:35 2018 +0000
@@ -1540,6 +1540,7 @@
   reposetup() for $TESTTMP/reposetup-test/src
   reposetup() for $TESTTMP/reposetup-test/src (chg !)
 
+#if no-extraextensions
   $ hg --cwd src debugextensions
   reposetup() for $TESTTMP/reposetup-test/src
   dodo (untested!)
@@ -1547,6 +1548,7 @@
   mq
   reposetuptest (untested!)
   strip
+#endif
 
   $ hg clone -U src clone-dst1
   reposetup() for $TESTTMP/reposetup-test/src