tests: hghave outer-repo should be true even if a bad repo is found stable
authorMads Kiilerich <mads@kiilerich.com>
Wed, 20 Jun 2012 23:41:21 +0200
branchstable
changeset 1105 9b2932ca75fd
parent 1104 5c7fdc5d6a36
child 1106 a02b1025536c
tests: hghave outer-repo should be true even if a bad repo is found Only the abort message 'no repository found' is a reliable indication that there is no outer repo. [ original upstream message ]
tests/hghave.py
--- a/tests/hghave.py	Wed Jun 20 23:41:21 2012 +0200
+++ b/tests/hghave.py	Wed Jun 20 23:41:21 2012 +0200
@@ -239,7 +239,9 @@
         return False
 
 def has_outer_repo():
-    return matchoutput('hg root 2>&1', r'')
+    # failing for other reasons than 'no repo' imply that there is a repo
+    return not matchoutput('hg root 2>&1',
+                           r'abort: no repository found', True)
 
 def has_ssl():
     try: