changeset 5339:f2139537c2be

tests: use hghaveaddon.py to check for check-manifest
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 24 May 2020 13:42:09 +0800
parents 6a50faea786d
children 995ed7aac8a6
files tests/hghaveaddon.py tests/test-check-setup-manifest.t
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tests/hghaveaddon.py	Sun May 24 13:20:45 2020 +0800
+++ b/tests/hghaveaddon.py	Sun May 24 13:42:09 2020 +0800
@@ -23,3 +23,8 @@
         return False
     else:
         return True
+
+@hghave.check("check-manifest", "check-manifest MANIFEST.in checking tool")
+def has_check_manifest():
+    return hghave.matchoutput('check-manifest --version 2>&1',
+                              br'check-manifest version')
--- a/tests/test-check-setup-manifest.t	Sun May 24 13:20:45 2020 +0800
+++ b/tests/test-check-setup-manifest.t	Sun May 24 13:42:09 2020 +0800
@@ -1,12 +1,5 @@
-#require test-repo
+#require test-repo check-manifest
 
-  $ checkcm() {
-  >   if ! (which check-manifest > /dev/null); then
-  >     echo skipped: missing tool: check-manifest;
-  >     exit 80;
-  >   fi;
-  > };
-  $ checkcm
   $ cat << EOF >> $HGRCPATH
   > [experimental]
   > evolution=all