Fix failing darcs test

tests/hghave

@@ -1,272 +1,272
 #!/usr/bin/env python
 """Test the running system for features availability. Exit with zero
 if all features are there, non-zero otherwise. If a feature name is
 prefixed with "no-", the absence of feature is tested.
 """
 import optparse
 import os
 import re
 import sys
 import tempfile
 
 tempprefix = 'hg-hghave-'
 
 def matchoutput(cmd, regexp, ignorestatus=False):
     """Return True if cmd executes successfully and its output
     is matched by the supplied regular expression.
     """
     r = re.compile(regexp)
     fh = os.popen(cmd)
     s = fh.read()
     try:
         ret = fh.close()
     except IOError:
         # Happen in Windows test environment
         ret = 1
     return (ignorestatus or ret is None) and r.search(s)
 
 def has_baz():
     return matchoutput('baz --version 2>&1', r'baz Bazaar version')
 
 def has_bzr():
     try:
         import bzrlib
         return bzrlib.__doc__ != None
     except ImportError:
         return False
 
 def has_bzr114():
     try:
         import bzrlib
         return (bzrlib.__doc__ != None
                 and bzrlib.version_info[:2] >= (1, 14))
     except ImportError:
         return False
 
 def has_cvs():
     re = r'Concurrent Versions System.*?server'
     return matchoutput('cvs --version 2>&1', re)
 
 def has_cvsps():
     return matchoutput('cvsps -h -q 2>&1', r'cvsps version', True)
 
 def has_darcs():
-    return matchoutput('darcs', r'darcs version', True)
+    return matchoutput('darcs --version', r'2\.[2-9]', True)
 
 def has_mtn():
     return matchoutput('mtn --version', r'monotone', True) and not matchoutput(
         'mtn --version', r'monotone 0\.(\d|[12]\d|3[01])[^\d]', True)
 
 def has_eol_in_paths():
     try:
         fd, path = tempfile.mkstemp(prefix=tempprefix, suffix='\n\r')
         os.close(fd)
         os.remove(path)
         return True
     except:
         return False
 
 def has_executablebit():
     fd, path = tempfile.mkstemp(prefix=tempprefix)
     os.close(fd)
     try:
         s = os.lstat(path).st_mode
         os.chmod(path, s | 0100)
         return (os.lstat(path).st_mode & 0100 != 0)
     finally:
         os.remove(path)
 
 def has_icasefs():
     # Stolen from mercurial.util
     fd, path = tempfile.mkstemp(prefix=tempprefix)
     os.close(fd)
     try:
         s1 = os.stat(path)
         d, b = os.path.split(path)
         p2 = os.path.join(d, b.upper())
         if path == p2:
             p2 = os.path.join(d, b.lower())
         try:
             s2 = os.stat(p2)
             return s2 == s1
         except:
             return False
     finally:
         os.remove(path)
 
 def has_inotify():
     try:
         import hgext.inotify.linux.watcher
         return True
     except ImportError:
         return False
 
 def has_fifo():
     return hasattr(os, "mkfifo")
 
 def has_hotshot():
     try:
         # hotshot.stats tests hotshot and many problematic dependencies
         # like profile.
         import hotshot.stats
         return True
     except ImportError:
         return False
 
 def has_lsprof():
     try:
         import _lsprof
         return True
     except ImportError:
         return False
 
 def has_git():
     return matchoutput('git --version 2>&1', r'^git version')
 
 def has_svn():
     return matchoutput('svn --version 2>&1', r'^svn, version') and \
         matchoutput('svnadmin --version 2>&1', r'^svnadmin, version')
 
 def has_svn_bindings():
     try:
         import svn.core
         version = svn.core.SVN_VER_MAJOR, svn.core.SVN_VER_MINOR
         if version < (1, 4):
             return False
         return True
     except ImportError:
         return False
 
 def has_p4():
     return matchoutput('p4 -V', r'Rev\. P4/') and matchoutput('p4d -V', r'Rev\. P4D/')
 
 def has_symlink():
     return hasattr(os, "symlink")
 
 def has_tla():
     return matchoutput('tla --version 2>&1', r'The GNU Arch Revision')
 
 def has_gpg():
     return matchoutput('gpg --version 2>&1', r'GnuPG')
 
 def has_unix_permissions():
     d = tempfile.mkdtemp(prefix=tempprefix, dir=".")
     try:
         fname = os.path.join(d, 'foo')
         for umask in (077, 007, 022):
             os.umask(umask)
             f = open(fname, 'w')
             f.close()
             mode = os.stat(fname).st_mode
             os.unlink(fname)
             if mode & 0777 != ~umask & 0666:
                 return False
         return True
     finally:
         os.rmdir(d)
 
 def has_pygments():
     try:
         import pygments
         return True
     except ImportError:
         return False
 
 def has_outer_repo():
     return matchoutput('hg root 2>&1', r'')
 
 checks = {
     "baz": (has_baz, "GNU Arch baz client"),
     "bzr": (has_bzr, "Canonical's Bazaar client"),
     "bzr114": (has_bzr114, "Canonical's Bazaar client >= 1.14"),
     "cvs": (has_cvs, "cvs client/server"),
     "cvsps": (has_cvsps, "cvsps utility"),
     "darcs": (has_darcs, "darcs client"),
     "eol-in-paths": (has_eol_in_paths, "end-of-lines in paths"),
     "execbit": (has_executablebit, "executable bit"),
     "fifo": (has_fifo, "named pipes"),
     "git": (has_git, "git command line client"),
     "gpg": (has_gpg, "gpg client"),
     "hotshot": (has_hotshot, "python hotshot module"),
     "icasefs": (has_icasefs, "case insensitive file system"),
     "inotify": (has_inotify, "inotify extension support"),
     "lsprof": (has_lsprof, "python lsprof module"),
     "mtn": (has_mtn, "monotone client (> 0.31)"),
     "outer-repo": (has_outer_repo, "outer repo"),
     "p4": (has_p4, "Perforce server and client"),
     "pygments": (has_pygments, "Pygments source highlighting library"),
     "svn": (has_svn, "subversion client and admin tools"),
     "svn-bindings": (has_svn_bindings, "subversion python bindings"),
     "symlink": (has_symlink, "symbolic links"),
     "tla": (has_tla, "GNU Arch tla client"),
     "unix-permissions": (has_unix_permissions, "unix-style permissions"),
 }
 
 def list_features():
     for name, feature in checks.iteritems():
         desc = feature[1]
         print name + ':', desc
 
 def test_features():
     failed = 0
     for name, feature in checks.iteritems():
         check, _ = feature
         try:
             check()
         except Exception, e:
             print "feature %s failed:  %s" % (name, e)
             failed += 1
     return failed
 
 parser = optparse.OptionParser("%prog [options] [features]")
 parser.add_option("--test-features", action="store_true",
                   help="test available features")
 parser.add_option("--list-features", action="store_true",
                   help="list available features")
 parser.add_option("-q", "--quiet", action="store_true",
                   help="check features silently")
 
 if __name__ == '__main__':
     options, args = parser.parse_args()
     if options.list_features:
         list_features()
         sys.exit(0)
 
     if options.test_features:
         sys.exit(test_features())
 
     quiet = options.quiet
 
     failures = 0
 
     def error(msg):
         global failures
         if not quiet:
             sys.stderr.write(msg + '\n')
         failures += 1
 
     for feature in args:
         negate = feature.startswith('no-')
         if negate:
             feature = feature[3:]
 
         if feature not in checks:
             error('skipped: unknown feature: ' + feature)
             continue
 
         check, desc = checks[feature]
         try:
             available = check()
         except Exception, e:
             error('hghave check failed: ' + feature)
             continue
 
         if not negate and not available:
             error('skipped: missing feature: ' + desc)
         elif negate and available:
             error('skipped: system supports %s' % desc)
 
     if failures != 0:
         sys.exit(1)
 
 

tests/test-convert-darcs

@@ -1,68 +1,63
 #!/bin/sh
 
 "$TESTDIR/hghave" darcs || exit 80
-if darcs --version 2>&1 | grep '^2\.' > /dev/null; then
-    # FIXME: darcs 2 will fail with
-    ### Abort: timeout after 180 seconds.
-    echo 'skipped: test currently disabled for darcs 2'
-    exit 80
-fi
 
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 DARCS_EMAIL='[e-mail]'; export DARCS_EMAIL
-HOME=do_not_use_HOME_darcs; export HOME
+HOME=`pwd`/do_not_use_HOME_darcs; export HOME
 
 # skip if we can't import elementtree
 mkdir dummy
 mkdir dummy/_darcs
 if hg convert dummy 2>&1 | grep ElementTree > /dev/null; then
     echo 'skipped: missing feature: elementtree module'
     exit 80
 fi
 
 echo % initialize darcs repo
 mkdir darcs-repo
 cd darcs-repo
 darcs init
 echo a > a
 darcs record -a -l -m p0
 cd ..
 
 echo % branch and update
 darcs get darcs-repo darcs-clone >/dev/null
 cd darcs-clone
 echo c >> a
 echo c > c
 darcs record -a -l -m p1.1
 cd ..
 
 echo % update source
 cd darcs-repo
 echo b >> a
 echo b > b
 darcs record -a -l -m p1.2
 
 echo % merge branch
 darcs pull -a ../darcs-clone
+sleep 1
 echo e > a
 darcs record -a -l -m p2
 cd ..
 
 glog()
 {
     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"
 }
 
-hg convert darcs-repo darcs-repo-hg 2>&1 | grep -v hGetLine | grep -v '^$'
+hg convert darcs-repo darcs-repo-hg
 # The converter does not currently handle patch conflicts very well.
 # When they occur, it reverts *all* changes and moves forward,
 # letting the conflict resolving patch fix collisions.
 # Unfortunately, non-conflicting changes, like the addition of the
 # "c" file in p1.1 patch are reverted too.
 # Just to say that manifest not listing "c" here is a bug.
 glog -R darcs-repo-hg
 hg up -q -R darcs-repo-hg
 hg -R darcs-repo-hg manifest --debug

tests/test-convert-darcs.out

@@ -1,29 +1,30
 % initialize darcs repo
 Finished recording patch 'p0'
 % branch and update
 Finished recording patch 'p1.1'
 % update source
 Finished recording patch 'p1.2'
 % merge branch
+Backing up ./a(-darcs-backup0)
 We have conflicts in the following files:
 ./a
 Finished pulling and applying.
 Finished recording patch 'p2'
 initializing destination darcs-repo-hg repository
 scanning source...
 sorting...
 converting...
 3 p0
 2 p1.2
 1 p1.1
 0 p2
 o  3 "p2" files: a
 |
 o  2 "p1.1" files:
 |
 o  1 "p1.2" files: a b
 |
 o  0 "p0" files: a
 
 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a
 1e88685f5ddec574a34c70af492f95b6debc8741 644   b