Mercurial > hgsubversion
view tests/comprehensive/test_verify_and_startrev.py @ 1512:6d0fe7ce9898
commands: fix command option registering
A recent patch introduced svnopts as a way of sharing the svn command options
between the old and the new way of registering a command. It turns out 'svnopts'
was already used further up in the module to define the flags that should be
added to *all* Mercurial commands. So our definition of it here cause us to add
all of these options to all Mercurial commands.
This was caught because it changes --rev to be '' instead of [], which breaks a
number of assumptions in the other commands.
Given that none of the subversion tests are command line tests, I'm not sure how
to test this. It was caught in other extensions tests.
(grafted from 3b1334407783a4379fd515e2ed9acc61e3f175ff)
(grafted from 6db63ead5556f2bf72e423ca8c6df08ea3a5b009)
author | Durham Goode <durham@fb.com> |
---|---|
date | Wed, 24 May 2017 15:07:00 -0700 |
parents | d4eb7b064085 |
children |
line wrap: on
line source
import os import sys import unittest # wrapped in a try/except because of weirdness in how # run.py works as compared to nose. try: import test_util except ImportError: sys.path.insert(0, os.path.dirname(os.path.dirname(__file__))) import test_util from mercurial import hg from mercurial import ui from hgsubversion import verify # these fixtures contain no files at HEAD and would result in empty clones _skipshallow = set([ 'binaryfiles.svndump', 'binaryfiles-broken.svndump', 'emptyrepo.svndump', 'correct.svndump', 'corrupt.svndump', ]) _skipall = set([ 'project_root_not_repo_root.svndump', 'movetotrunk.svndump', ]) _skipstandard = set([ 'subdir_is_file_prefix.svndump', 'correct.svndump', 'corrupt.svndump', 'emptyrepo2.svndump', 'dir_removal.svndump', ]) def _do_case(self, name, layout): subdir = test_util.subdir.get(name, '') config = {} for branch, path in test_util.custom.get(name, {}).iteritems(): config['hgsubversionbranch.%s' % branch] = path repo, svnpath = self.load_and_fetch(name, subdir=subdir, layout=layout, config=config) assert test_util.repolen(self.repo) > 0 for i in repo: ctx = repo[i] self.assertEqual(verify.verify(repo.ui, repo, rev=ctx.node(), stupid=True), 0) self.assertEqual(verify.verify(repo.ui, repo, rev=ctx.node(), stupid=False), 0) # check a startrev clone if layout == 'single' and name not in _skipshallow: self.wc_path += '_shallow' shallowrepo = self.fetch(svnpath, subdir=subdir, layout='single', startrev='HEAD') self.assertEqual(test_util.repolen(shallowrepo), 1, "shallow clone should have just one revision, not %d" % test_util.repolen(shallowrepo)) fulltip = repo['tip'] shallowtip = shallowrepo['tip'] repo.ui.pushbuffer() self.assertEqual(0, verify.verify(repo.ui, shallowrepo, rev=shallowtip.node(), stupid=True)) self.assertEqual(0, verify.verify(repo.ui, shallowrepo, rev=shallowtip.node(), stupid=False)) stupidui = test_util.testui(stupid=True) self.assertEqual(verify.verify(stupidui, repo, rev=ctx.node(), stupid=True), 0) self.assertEqual(verify.verify(stupidui, repo, rev=ctx.node(), stupid=False), 0) # viewing diff's of lists of files is easier on the eyes self.assertMultiLineEqual('\n'.join(fulltip), '\n'.join(shallowtip), repo.ui.popbuffer()) for f in fulltip: self.assertMultiLineEqual(fulltip[f].data(), shallowtip[f].data()) def buildmethod(case, name, layout): m = lambda self: self._do_case(case, layout) m.__name__ = name m.__doc__ = 'Test verify on %s (%s)' % (case, layout) return m attrs = {'_do_case': _do_case, 'stupid_mode_tests': True} fixtures = [f for f in os.listdir(test_util.FIXTURES) if f.endswith('.svndump')] for case in fixtures: if case in _skipall: continue bname = 'test_' + case[:-len('.svndump')] if case not in _skipstandard: attrs[bname] = buildmethod(case, bname, 'standard') attrs[bname + '_single'] = buildmethod(case, bname + '_single', 'single') if case in test_util.custom: attrs[bname + '_custom'] = buildmethod(case, bname + '_custom', 'custom') VerifyTests = type('VerifyTests', (test_util.TestBase,), attrs)