Add an API to affect the choice of RCS parser.
[cvs2svn.git] / run-tests.py
blobe6817ef6d98f6627c878c411463f1cad8fba4d2c
1 #!/usr/bin/env python
3 # run_tests.py: test suite for cvs2svn
5 # Usage: run_tests.py [-v | --verbose] [list | <num>]
7 # Options:
8 # -v, --verbose
9 # enable verbose output
11 # Arguments (at most one argument is allowed):
12 # list
13 # If the word "list" is passed as an argument, the list of
14 # available tests is printed (but no tests are run).
16 # <num>
17 # If a number is passed as an argument, then only the test
18 # with that number is run.
20 # If no argument is specified, then all tests are run.
22 # Subversion is a tool for revision control.
23 # See http://subversion.tigris.org for more information.
25 # ====================================================================
26 # Copyright (c) 2000-2009 CollabNet. All rights reserved.
28 # This software is licensed as described in the file COPYING, which
29 # you should have received as part of this distribution. The terms
30 # are also available at http://subversion.tigris.org/license-1.html.
31 # If newer versions of this license are posted there, you may use a
32 # newer version instead, at your option.
34 ######################################################################
36 # General modules
37 import sys
38 import shutil
39 import stat
40 import re
41 import os
42 import time
43 import os.path
44 import locale
45 import textwrap
46 import calendar
47 import types
48 try:
49 from hashlib import md5
50 except ImportError:
51 from md5 import md5
52 from difflib import Differ
54 # Make sure that a supported version of Python is being used:
55 if not (0x02040000 <= sys.hexversion < 0x03000000):
56 sys.stderr.write(
57 'error: Python 2, version 2.4 or higher required.\n'
59 sys.exit(1)
61 # This script needs to run in the correct directory. Make sure we're there.
62 if not (os.path.exists('cvs2svn') and os.path.exists('test-data')):
63 sys.stderr.write("error: I need to be run in the directory containing "
64 "'cvs2svn' and 'test-data'.\n")
65 sys.exit(1)
67 # Load the Subversion test framework.
68 import svntest
69 from svntest import Failure
70 from svntest.main import safe_rmtree
71 from svntest.testcase import TestCase
72 from svntest.testcase import XFail
74 # Test if Mercurial >= 1.1 is available.
75 try:
76 from mercurial import context
77 context.memctx
78 have_hg = True
79 except (ImportError, AttributeError):
80 have_hg = False
82 cvs2svn = os.path.abspath('cvs2svn')
83 cvs2git = os.path.abspath('cvs2git')
84 cvs2hg = os.path.abspath('cvs2hg')
86 # We use the installed svn and svnlook binaries, instead of using
87 # svntest.main.run_svn() and svntest.main.run_svnlook(), because the
88 # behavior -- or even existence -- of local builds shouldn't affect
89 # the cvs2svn test suite.
90 svn_binary = 'svn'
91 svnlook_binary = 'svnlook'
92 svnadmin_binary = 'svnadmin'
93 svnversion_binary = 'svnversion'
95 test_data_dir = 'test-data'
96 tmp_dir = 'cvs2svn-tmp'
99 #----------------------------------------------------------------------
100 # Helpers.
101 #----------------------------------------------------------------------
104 # The value to expect for svn:keywords if it is set:
105 KEYWORDS = 'Author Date Id Revision'
108 class RunProgramException(Failure):
109 pass
112 class MissingErrorException(Failure):
113 def __init__(self, error_re):
114 Failure.__init__(
115 self, "Test failed because no error matched '%s'" % (error_re,)
119 def run_program(program, error_re, *varargs):
120 """Run PROGRAM with VARARGS, return stdout as a list of lines.
122 If there is any stderr and ERROR_RE is None, raise
123 RunProgramException, and print the stderr lines if
124 svntest.main.options.verbose is true.
126 If ERROR_RE is not None, it is a string regular expression that must
127 match some line of stderr. If it fails to match, raise
128 MissingErrorExpection."""
130 # FIXME: exit_code is currently ignored.
131 exit_code, out, err = svntest.main.run_command(program, 1, 0, *varargs)
133 if error_re:
134 # Specified error expected on stderr.
135 if not err:
136 raise MissingErrorException(error_re)
137 else:
138 for line in err:
139 if re.match(error_re, line):
140 return out
141 raise MissingErrorException(error_re)
142 else:
143 # No stderr allowed.
144 if err:
145 if svntest.main.options.verbose:
146 print '\n%s said:\n' % program
147 for line in err:
148 print ' ' + line,
149 print
150 raise RunProgramException()
152 return out
155 def run_script(script, error_re, *varargs):
156 """Run Python script SCRIPT with VARARGS, returning stdout as a list
157 of lines.
159 If there is any stderr and ERROR_RE is None, raise
160 RunProgramException, and print the stderr lines if
161 svntest.main.options.verbose is true.
163 If ERROR_RE is not None, it is a string regular expression that must
164 match some line of stderr. If it fails to match, raise
165 MissingErrorException."""
167 # Use the same python that is running this script
168 return run_program(sys.executable, error_re, script, *varargs)
169 # On Windows, for an unknown reason, the cmd.exe process invoked by
170 # os.system('sort ...') in cvs2svn receives invalid stdio handles, if
171 # cvs2svn is started as "cvs2svn ...". "python cvs2svn ..." avoids
172 # this. Therefore, the redirection of the output to the .s-revs file fails.
173 # We no longer use the problematic invocation on any system, but this
174 # comment remains to warn about this problem.
177 def run_svn(*varargs):
178 """Run svn with VARARGS; return stdout as a list of lines.
179 If there is any stderr, raise RunProgramException, and print the
180 stderr lines if svntest.main.options.verbose is true."""
181 return run_program(svn_binary, None, *varargs)
184 def repos_to_url(path_to_svn_repos):
185 """This does what you think it does."""
186 rpath = os.path.abspath(path_to_svn_repos)
187 if rpath[0] != '/':
188 rpath = '/' + rpath
189 return 'file://%s' % rpath.replace(os.sep, '/')
192 def svn_strptime(timestr):
193 return time.strptime(timestr, '%Y-%m-%d %H:%M:%S')
196 class Log:
197 def __init__(self, revision, author, date, symbols):
198 self.revision = revision
199 self.author = author
201 # Internally, we represent the date as seconds since epoch (UTC).
202 # Since standard subversion log output shows dates in localtime
204 # "1993-06-18 00:46:07 -0500 (Fri, 18 Jun 1993)"
206 # and time.mktime() converts from localtime, it all works out very
207 # happily.
208 self.date = time.mktime(svn_strptime(date[0:19]))
210 # The following symbols are used for string interpolation when
211 # checking paths:
212 self.symbols = symbols
214 # The changed paths will be accumulated later, as log data is read.
215 # Keys here are paths such as '/trunk/foo/bar', values are letter
216 # codes such as 'M', 'A', and 'D'.
217 self.changed_paths = { }
219 # The msg will be accumulated later, as log data is read.
220 self.msg = ''
222 def absorb_changed_paths(self, out):
223 'Read changed paths from OUT into self, until no more.'
224 while 1:
225 line = out.readline()
226 if len(line) == 1: return
227 line = line[:-1]
228 op_portion = line[3:4]
229 path_portion = line[5:]
230 # If we're running on Windows we get backslashes instead of
231 # forward slashes.
232 path_portion = path_portion.replace('\\', '/')
233 # # We could parse out history information, but currently we
234 # # just leave it in the path portion because that's how some
235 # # tests expect it.
237 # m = re.match("(.*) \(from /.*:[0-9]+\)", path_portion)
238 # if m:
239 # path_portion = m.group(1)
240 self.changed_paths[path_portion] = op_portion
242 def __cmp__(self, other):
243 return cmp(self.revision, other.revision) or \
244 cmp(self.author, other.author) or cmp(self.date, other.date) or \
245 cmp(self.changed_paths, other.changed_paths) or \
246 cmp(self.msg, other.msg)
248 def get_path_op(self, path):
249 """Return the operator for the change involving PATH.
251 PATH is allowed to include string interpolation directives (e.g.,
252 '%(trunk)s'), which are interpolated against self.symbols. Return
253 None if there is no record for PATH."""
254 return self.changed_paths.get(path % self.symbols)
256 def check_msg(self, msg):
257 """Verify that this Log's message starts with the specified MSG."""
258 if self.msg.find(msg) != 0:
259 raise Failure(
260 "Revision %d log message was:\n%s\n\n"
261 "It should have begun with:\n%s\n\n"
262 % (self.revision, self.msg, msg,)
265 def check_change(self, path, op):
266 """Verify that this Log includes a change for PATH with operator OP.
268 PATH is allowed to include string interpolation directives (e.g.,
269 '%(trunk)s'), which are interpolated against self.symbols."""
271 path = path % self.symbols
272 found_op = self.changed_paths.get(path, None)
273 if found_op is None:
274 raise Failure(
275 "Revision %d does not include change for path %s "
276 "(it should have been %s).\n"
277 % (self.revision, path, op,)
279 if found_op != op:
280 raise Failure(
281 "Revision %d path %s had op %s (it should have been %s)\n"
282 % (self.revision, path, found_op, op,)
285 def check_changes(self, changed_paths):
286 """Verify that this Log has precisely the CHANGED_PATHS specified.
288 CHANGED_PATHS is a sequence of tuples (path, op), where the paths
289 strings are allowed to include string interpolation directives
290 (e.g., '%(trunk)s'), which are interpolated against self.symbols."""
292 cp = {}
293 for (path, op) in changed_paths:
294 cp[path % self.symbols] = op
296 if self.changed_paths != cp:
297 raise Failure(
298 "Revision %d changed paths list was:\n%s\n\n"
299 "It should have been:\n%s\n\n"
300 % (self.revision, self.changed_paths, cp,)
303 def check(self, msg, changed_paths):
304 """Verify that this Log has the MSG and CHANGED_PATHS specified.
306 Convenience function to check two things at once. MSG is passed
307 to check_msg(); CHANGED_PATHS is passed to check_changes()."""
309 self.check_msg(msg)
310 self.check_changes(changed_paths)
313 def parse_log(svn_repos, symbols):
314 """Return a dictionary of Logs, keyed on revision number, for SVN_REPOS.
316 Initialize the Logs' symbols with SYMBOLS."""
318 class LineFeeder:
319 'Make a list of lines behave like an open file handle.'
320 def __init__(self, lines):
321 self.lines = lines
322 def readline(self):
323 if len(self.lines) > 0:
324 return self.lines.pop(0)
325 else:
326 return None
328 def absorb_message_body(out, num_lines, log):
329 """Read NUM_LINES of log message body from OUT into Log item LOG."""
331 for i in range(num_lines):
332 log.msg += out.readline()
334 log_start_re = re.compile('^r(?P<rev>[0-9]+) \| '
335 '(?P<author>[^\|]+) \| '
336 '(?P<date>[^\|]+) '
337 '\| (?P<lines>[0-9]+) (line|lines)$')
339 log_separator = '-' * 72
341 logs = { }
343 out = LineFeeder(run_svn('log', '-v', repos_to_url(svn_repos)))
345 while 1:
346 this_log = None
347 line = out.readline()
348 if not line: break
349 line = line[:-1]
351 if line.find(log_separator) == 0:
352 line = out.readline()
353 if not line: break
354 line = line[:-1]
355 m = log_start_re.match(line)
356 if m:
357 this_log = Log(
358 int(m.group('rev')), m.group('author'), m.group('date'), symbols)
359 line = out.readline()
360 if not line.find('Changed paths:') == 0:
361 print 'unexpected log output (missing changed paths)'
362 print "Line: '%s'" % line
363 sys.exit(1)
364 this_log.absorb_changed_paths(out)
365 absorb_message_body(out, int(m.group('lines')), this_log)
366 logs[this_log.revision] = this_log
367 elif len(line) == 0:
368 break # We've reached the end of the log output.
369 else:
370 print 'unexpected log output (missing revision line)'
371 print "Line: '%s'" % line
372 sys.exit(1)
373 else:
374 print 'unexpected log output (missing log separator)'
375 print "Line: '%s'" % line
376 sys.exit(1)
378 return logs
381 def erase(path):
382 """Unconditionally remove PATH and its subtree, if any. PATH may be
383 non-existent, a file or symlink, or a directory."""
384 if os.path.isdir(path):
385 safe_rmtree(path)
386 elif os.path.exists(path):
387 os.remove(path)
390 log_msg_text_wrapper = textwrap.TextWrapper(width=76, break_long_words=False)
392 def sym_log_msg(symbolic_name, is_tag=None):
393 """Return the expected log message for a cvs2svn-synthesized revision
394 creating branch or tag SYMBOLIC_NAME."""
396 # This reproduces the logic in SVNSymbolCommit.get_log_msg().
397 if is_tag:
398 type = 'tag'
399 else:
400 type = 'branch'
402 return log_msg_text_wrapper.fill(
403 "This commit was manufactured by cvs2svn to create %s '%s'."
404 % (type, symbolic_name)
408 def make_conversion_id(
409 name, args, passbypass, options_file=None, symbol_hints_file=None
411 """Create an identifying tag for a conversion.
413 The return value can also be used as part of a filesystem path.
415 NAME is the name of the CVS repository.
417 ARGS are the extra arguments to be passed to cvs2svn.
419 PASSBYPASS is a boolean indicating whether the conversion is to be
420 run one pass at a time.
422 If OPTIONS_FILE is specified, it is an options file that will be
423 used for the conversion.
425 If SYMBOL_HINTS_FILE is specified, it is a symbol hints file that
426 will be used for the conversion.
428 The 1-to-1 mapping between cvs2svn command parameters and
429 conversion_ids allows us to avoid running the same conversion more
430 than once, when multiple tests use exactly the same conversion."""
432 conv_id = name
434 args = args[:]
436 if passbypass:
437 args.append('--passbypass')
439 if symbol_hints_file is not None:
440 args.append('--symbol-hints=%s' % (symbol_hints_file,))
442 # There are some characters that are forbidden in filenames, and
443 # there is a limit on the total length of a path to a file. So use
444 # a hash of the parameters rather than concatenating the parameters
445 # into a string.
446 if args:
447 conv_id += "-" + md5('\0'.join(args)).hexdigest()
449 # Some options-file based tests rely on knowing the paths to which
450 # the repository should be written, so we handle that option as a
451 # predictable string:
452 if options_file is not None:
453 conv_id += '--options=%s' % (options_file,)
455 return conv_id
458 class Conversion:
459 """A record of a cvs2svn conversion.
461 Fields:
463 conv_id -- the conversion id for this Conversion.
465 name -- a one-word name indicating the involved repositories.
467 dumpfile -- the name of the SVN dumpfile created by the conversion
468 (if the DUMPFILE constructor argument was used); otherwise,
469 None.
471 repos -- the path to the svn repository. Unset if DUMPFILE was
472 specified.
474 logs -- a dictionary of Log instances, as returned by parse_log().
475 Unset if DUMPFILE was specified.
477 symbols -- a dictionary of symbols used for string interpolation
478 in path names.
480 stdout -- a list of lines written by cvs2svn to stdout
482 _wc -- the basename of the svn working copy (within tmp_dir).
483 Unset if DUMPFILE was specified.
485 _wc_path -- the path to the svn working copy, if it has already
486 been created; otherwise, None. (The working copy is created
487 lazily when get_wc() is called.) Unset if DUMPFILE was
488 specified.
490 _wc_tree -- the tree built from the svn working copy, if it has
491 already been created; otherwise, None. The tree is created
492 lazily when get_wc_tree() is called.) Unset if DUMPFILE was
493 specified.
495 _svnrepos -- the basename of the svn repository (within tmp_dir).
496 Unset if DUMPFILE was specified."""
498 # The number of the last cvs2svn pass (determined lazily by
499 # get_last_pass()).
500 last_pass = None
502 @classmethod
503 def get_last_pass(cls):
504 """Return the number of cvs2svn's last pass."""
506 if cls.last_pass is None:
507 out = run_script(cvs2svn, None, '--help-passes')
508 cls.last_pass = int(out[-1].split()[0])
509 return cls.last_pass
511 def __init__(
512 self, conv_id, name, error_re, passbypass, symbols, args,
513 options_file=None, symbol_hints_file=None, dumpfile=None,
515 self.conv_id = conv_id
516 self.name = name
517 self.symbols = symbols
518 if not os.path.isdir(tmp_dir):
519 os.mkdir(tmp_dir)
521 cvsrepos = os.path.join(test_data_dir, '%s-cvsrepos' % self.name)
523 if dumpfile:
524 self.dumpfile = os.path.join(tmp_dir, dumpfile)
525 # Clean up from any previous invocations of this script.
526 erase(self.dumpfile)
527 else:
528 self.dumpfile = None
529 self.repos = os.path.join(tmp_dir, '%s-svnrepos' % self.conv_id)
530 self._wc = os.path.join(tmp_dir, '%s-wc' % self.conv_id)
531 self._wc_path = None
532 self._wc_tree = None
534 # Clean up from any previous invocations of this script.
535 erase(self.repos)
536 erase(self._wc)
538 args = list(args)
539 args.extend([
540 '--svnadmin=%s' % (svntest.main.svnadmin_binary,),
542 if options_file:
543 self.options_file = os.path.join(cvsrepos, options_file)
544 args.extend([
545 '--options=%s' % self.options_file,
547 assert not symbol_hints_file
548 else:
549 self.options_file = None
550 if tmp_dir != 'cvs2svn-tmp':
551 # Only include this argument if it differs from cvs2svn's default:
552 args.extend([
553 '--tmpdir=%s' % tmp_dir,
556 if symbol_hints_file:
557 self.symbol_hints_file = os.path.join(cvsrepos, symbol_hints_file)
558 args.extend([
559 '--symbol-hints=%s' % self.symbol_hints_file,
562 if self.dumpfile:
563 args.extend(['--dumpfile=%s' % (self.dumpfile,)])
564 else:
565 args.extend(['-s', self.repos])
566 args.extend([cvsrepos])
568 if passbypass:
569 self.stdout = []
570 for p in range(1, self.get_last_pass() + 1):
571 self.stdout += run_script(cvs2svn, error_re, '-p', str(p), *args)
572 else:
573 self.stdout = run_script(cvs2svn, error_re, *args)
575 if self.dumpfile:
576 if not os.path.isfile(self.dumpfile):
577 raise Failure(
578 "Dumpfile not created: '%s'"
579 % os.path.join(os.getcwd(), self.dumpfile)
581 else:
582 if os.path.isdir(self.repos):
583 self.logs = parse_log(self.repos, self.symbols)
584 elif error_re is None:
585 raise Failure(
586 "Repository not created: '%s'"
587 % os.path.join(os.getcwd(), self.repos)
590 def output_found(self, pattern):
591 """Return True if PATTERN matches any line in self.stdout.
593 PATTERN is a regular expression pattern as a string.
596 pattern_re = re.compile(pattern)
598 for line in self.stdout:
599 if pattern_re.match(line):
600 # We found the pattern that we were looking for.
601 return 1
602 else:
603 return 0
605 def find_tag_log(self, tagname):
606 """Search LOGS for a log message containing 'TAGNAME' and return the
607 log in which it was found."""
608 for i in xrange(len(self.logs), 0, -1):
609 if self.logs[i].msg.find("'"+tagname+"'") != -1:
610 return self.logs[i]
611 raise ValueError("Tag %s not found in logs" % tagname)
613 def get_wc(self, *args):
614 """Return the path to the svn working copy, or a path within the WC.
616 If a working copy has not been created yet, create it now.
618 If ARGS are specified, then they should be strings that form
619 fragments of a path within the WC. They are joined using
620 os.path.join() and appended to the WC path."""
622 if self._wc_path is None:
623 run_svn('co', repos_to_url(self.repos), self._wc)
624 self._wc_path = self._wc
625 return os.path.join(self._wc_path, *args)
627 def get_wc_tree(self):
628 if self._wc_tree is None:
629 self._wc_tree = svntest.tree.build_tree_from_wc(self.get_wc(), 1)
630 return self._wc_tree
632 def path_exists(self, *args):
633 """Return True if the specified path exists within the repository.
635 (The strings in ARGS are first joined into a path using
636 os.path.join().)"""
638 return os.path.exists(self.get_wc(*args))
640 def check_props(self, keys, checks):
641 """Helper function for checking lots of properties. For a list of
642 files in the conversion, check that the values of the properties
643 listed in KEYS agree with those listed in CHECKS. CHECKS is a
644 list of tuples: [ (filename, [value, value, ...]), ...], where the
645 values are listed in the same order as the key names are listed in
646 KEYS."""
648 for (file, values) in checks:
649 assert len(values) == len(keys)
650 props = props_for_path(self.get_wc_tree(), file)
651 for i in range(len(keys)):
652 if props.get(keys[i]) != values[i]:
653 raise Failure(
654 "File %s has property %s set to \"%s\" "
655 "(it should have been \"%s\").\n"
656 % (file, keys[i], props.get(keys[i]), values[i],)
660 class GitConversion:
661 """A record of a cvs2svn conversion.
663 Fields:
665 name -- a one-word name indicating the CVS repository to be converted.
667 stdout -- a list of lines written by cvs2svn to stdout."""
669 def __init__(self, name, error_re, args, options_file=None):
670 self.name = name
671 if not os.path.isdir(tmp_dir):
672 os.mkdir(tmp_dir)
674 cvsrepos = os.path.join(test_data_dir, '%s-cvsrepos' % self.name)
676 args = list(args)
677 if options_file:
678 self.options_file = os.path.join(cvsrepos, options_file)
679 args.extend([
680 '--options=%s' % self.options_file,
682 else:
683 self.options_file = None
685 self.stdout = run_script(cvs2git, error_re, *args)
688 # Cache of conversions that have already been done. Keys are conv_id;
689 # values are Conversion instances.
690 already_converted = { }
692 def ensure_conversion(
693 name, error_re=None, passbypass=None,
694 trunk=None, branches=None, tags=None,
695 args=None, options_file=None, symbol_hints_file=None, dumpfile=None,
697 """Convert CVS repository NAME to Subversion, but only if it has not
698 been converted before by this invocation of this script. If it has
699 been converted before, return the Conversion object from the
700 previous invocation.
702 If no error, return a Conversion instance.
704 If ERROR_RE is a string, it is a regular expression expected to
705 match some line of stderr printed by the conversion. If there is an
706 error and ERROR_RE is not set, then raise Failure.
708 If PASSBYPASS is set, then cvs2svn is run multiple times, each time
709 with a -p option starting at 1 and increasing to a (hardcoded) maximum.
711 NAME is just one word. For example, 'main' would mean to convert
712 './test-data/main-cvsrepos', and after the conversion, the resulting
713 Subversion repository would be in './cvs2svn-tmp/main-svnrepos', and
714 a checked out head working copy in './cvs2svn-tmp/main-wc'.
716 Any other options to pass to cvs2svn should be in ARGS, each element
717 being one option, e.g., '--trunk-only'. If the option takes an
718 argument, include it directly, e.g., '--mime-types=PATH'. Arguments
719 are passed to cvs2svn in the order that they appear in ARGS.
721 If OPTIONS_FILE is specified, then it should be the name of a file
722 within the main directory of the cvs repository associated with this
723 test. It is passed to cvs2svn using the --options option (which
724 suppresses some other options that are incompatible with --options).
726 If SYMBOL_HINTS_FILE is specified, then it should be the name of a
727 file within the main directory of the cvs repository associated with
728 this test. It is passed to cvs2svn using the --symbol-hints option.
730 If DUMPFILE is specified, then it is the name of a dumpfile within
731 the temporary directory to which the conversion output should be
732 written."""
734 if args is None:
735 args = []
736 else:
737 args = list(args)
739 if trunk is None:
740 trunk = 'trunk'
741 else:
742 args.append('--trunk=%s' % (trunk,))
744 if branches is None:
745 branches = 'branches'
746 else:
747 args.append('--branches=%s' % (branches,))
749 if tags is None:
750 tags = 'tags'
751 else:
752 args.append('--tags=%s' % (tags,))
754 conv_id = make_conversion_id(
755 name, args, passbypass, options_file, symbol_hints_file
758 if conv_id not in already_converted:
759 try:
760 # Run the conversion and store the result for the rest of this
761 # session:
762 already_converted[conv_id] = Conversion(
763 conv_id, name, error_re, passbypass,
764 {'trunk' : trunk, 'branches' : branches, 'tags' : tags},
765 args, options_file, symbol_hints_file, dumpfile,
767 except Failure:
768 # Remember the failure so that a future attempt to run this conversion
769 # does not bother to retry, but fails immediately.
770 already_converted[conv_id] = None
771 raise
773 conv = already_converted[conv_id]
774 if conv is None:
775 raise Failure()
776 return conv
779 class Cvs2SvnTestFunction(TestCase):
780 """A TestCase based on a naked Python function object.
782 FUNC should be a function that returns None on success and throws an
783 svntest.Failure exception on failure. It should have a brief
784 docstring describing what it does (and fulfilling certain
785 conditions). FUNC must take no arguments.
787 This class is almost identical to svntest.testcase.FunctionTestCase,
788 except that the test function does not require a sandbox and does
789 not accept any parameter (not even sandbox=None).
791 This class can be used as an annotation on a Python function.
795 def __init__(self, func):
796 # it better be a function that accepts no parameters and has a
797 # docstring on it.
798 assert isinstance(func, types.FunctionType)
800 name = func.func_name
802 assert func.func_code.co_argcount == 0, \
803 '%s must not take any arguments' % name
805 doc = func.__doc__.strip()
806 assert doc, '%s must have a docstring' % name
808 # enforce stylistic guidelines for the function docstrings:
809 # - no longer than 50 characters
810 # - should not end in a period
811 # - should not be capitalized
812 assert len(doc) <= 50, \
813 "%s's docstring must be 50 characters or less" % name
814 assert doc[-1] != '.', \
815 "%s's docstring should not end in a period" % name
816 assert doc[0].lower() == doc[0], \
817 "%s's docstring should not be capitalized" % name
819 TestCase.__init__(self, doc=doc)
820 self.func = func
822 def get_function_name(self):
823 return self.func.func_name
825 def get_sandbox_name(self):
826 return None
828 def run(self, sandbox):
829 return self.func()
832 class Cvs2HgTestFunction(Cvs2SvnTestFunction):
833 """Same as Cvs2SvnTestFunction, but for test cases that should be
834 skipped if Mercurial is not available.
836 def run(self, sandbox):
837 if not have_hg:
838 raise svntest.Skip()
839 else:
840 return self.func()
843 class Cvs2SvnTestCase(TestCase):
844 def __init__(
845 self, name, doc=None, variant=None,
846 error_re=None, passbypass=None,
847 trunk=None, branches=None, tags=None,
848 args=None,
849 options_file=None, symbol_hints_file=None, dumpfile=None,
851 self.name = name
853 if doc is None:
854 # By default, use the first line of the class docstring as the
855 # doc:
856 doc = self.__doc__.splitlines()[0]
858 if variant is not None:
859 # Modify doc to show the variant. Trim doc first if necessary
860 # to stay within the 50-character limit.
861 suffix = '...variant %s' % (variant,)
862 doc = doc[:50 - len(suffix)] + suffix
864 TestCase.__init__(self, doc=doc)
866 self.error_re = error_re
867 self.passbypass = passbypass
868 self.trunk = trunk
869 self.branches = branches
870 self.tags = tags
871 self.args = args
872 self.options_file = options_file
873 self.symbol_hints_file = symbol_hints_file
874 self.dumpfile = dumpfile
876 def ensure_conversion(self):
877 return ensure_conversion(
878 self.name,
879 error_re=self.error_re, passbypass=self.passbypass,
880 trunk=self.trunk, branches=self.branches, tags=self.tags,
881 args=self.args,
882 options_file=self.options_file,
883 symbol_hints_file=self.symbol_hints_file,
884 dumpfile=self.dumpfile,
887 def get_sandbox_name(self):
888 return None
891 class Cvs2SvnPropertiesTestCase(Cvs2SvnTestCase):
892 """Test properties resulting from a conversion."""
894 def __init__(self, name, props_to_test, expected_props, **kw):
895 """Initialize an instance of Cvs2SvnPropertiesTestCase.
897 NAME is the name of the test, passed to Cvs2SvnTestCase.
898 PROPS_TO_TEST is a list of the names of svn properties that should
899 be tested. EXPECTED_PROPS is a list of tuples [(filename,
900 [value,...])], where the second item in each tuple is a list of
901 values expected for the properties listed in PROPS_TO_TEST for the
902 specified filename. If a property must *not* be set, then its
903 value should be listed as None."""
905 Cvs2SvnTestCase.__init__(self, name, **kw)
906 self.props_to_test = props_to_test
907 self.expected_props = expected_props
909 def run(self, sbox):
910 conv = self.ensure_conversion()
911 conv.check_props(self.props_to_test, self.expected_props)
914 #----------------------------------------------------------------------
915 # Tests.
916 #----------------------------------------------------------------------
919 @Cvs2SvnTestFunction
920 def show_usage():
921 "cvs2svn with no arguments shows usage"
922 out = run_script(cvs2svn, None)
923 if (len(out) > 2 and out[0].find('ERROR:') == 0
924 and out[1].find('DBM module')):
925 print 'cvs2svn cannot execute due to lack of proper DBM module.'
926 print 'Exiting without running any further tests.'
927 sys.exit(1)
928 if out[0].find('Usage:') < 0:
929 raise Failure('Basic cvs2svn invocation failed.')
932 @Cvs2SvnTestFunction
933 def cvs2svn_manpage():
934 "generate a manpage for cvs2svn"
935 out = run_script(cvs2svn, None, '--man')
938 @Cvs2SvnTestFunction
939 def cvs2git_manpage():
940 "generate a manpage for cvs2git"
941 out = run_script(cvs2git, None, '--man')
944 @Cvs2HgTestFunction
945 def cvs2hg_manpage():
946 "generate a manpage for cvs2hg"
947 out = run_script(cvs2hg, None, '--man')
950 @Cvs2SvnTestFunction
951 def show_help_passes():
952 "cvs2svn --help-passes shows pass information"
953 out = run_script(cvs2svn, None, '--help-passes')
954 if out[0].find('PASSES') < 0:
955 raise Failure('cvs2svn --help-passes failed.')
958 @Cvs2SvnTestFunction
959 def attr_exec():
960 "detection of the executable flag"
961 if sys.platform == 'win32':
962 raise svntest.Skip()
963 conv = ensure_conversion('main')
964 st = os.stat(conv.get_wc('trunk', 'single-files', 'attr-exec'))
965 if not st.st_mode & stat.S_IXUSR:
966 raise Failure()
969 @Cvs2SvnTestFunction
970 def space_fname():
971 "conversion of filename with a space"
972 conv = ensure_conversion('main')
973 if not conv.path_exists('trunk', 'single-files', 'space fname'):
974 raise Failure()
977 @Cvs2SvnTestFunction
978 def two_quick():
979 "two commits in quick succession"
980 conv = ensure_conversion('main')
981 logs = parse_log(
982 os.path.join(conv.repos, 'trunk', 'single-files', 'twoquick'), {})
983 if len(logs) != 2:
984 raise Failure()
987 class PruneWithCare(Cvs2SvnTestCase):
988 "prune, but never too much"
990 def __init__(self, **kw):
991 Cvs2SvnTestCase.__init__(self, 'main', **kw)
993 def run(self, sbox):
994 # Robert Pluim encountered this lovely one while converting the
995 # directory src/gnu/usr.bin/cvs/contrib/pcl-cvs/ in FreeBSD's CVS
996 # repository (see issue #1302). Step 4 is the doozy:
998 # revision 1: adds trunk/blah/, adds trunk/blah/first
999 # revision 2: adds trunk/blah/second
1000 # revision 3: deletes trunk/blah/first
1001 # revision 4: deletes blah [re-deleting trunk/blah/first pruned blah!]
1002 # revision 5: does nothing
1004 # After fixing cvs2svn, the sequence (correctly) looks like this:
1006 # revision 1: adds trunk/blah/, adds trunk/blah/first
1007 # revision 2: adds trunk/blah/second
1008 # revision 3: deletes trunk/blah/first
1009 # revision 4: does nothing [because trunk/blah/first already deleted]
1010 # revision 5: deletes blah
1012 # The difference is in 4 and 5. In revision 4, it's not correct
1013 # to prune blah/, because second is still in there, so revision 4
1014 # does nothing now. But when we delete second in 5, that should
1015 # bubble up and prune blah/ instead.
1017 # ### Note that empty revisions like 4 are probably going to become
1018 # ### at least optional, if not banished entirely from cvs2svn's
1019 # ### output. Hmmm, or they may stick around, with an extra
1020 # ### revision property explaining what happened. Need to think
1021 # ### about that. In some sense, it's a bug in Subversion itself,
1022 # ### that such revisions don't show up in 'svn log' output.
1024 conv = self.ensure_conversion()
1026 # Confirm that revision 4 removes '/trunk/full-prune/first',
1027 # and that revision 6 removes '/trunk/full-prune'.
1029 # Also confirm similar things about '/full-prune-reappear/...',
1030 # which is similar, except that later on it reappears, restored
1031 # from pruneland, because a file gets added to it.
1033 # And finally, a similar thing for '/partial-prune/...', except that
1034 # in its case, a permanent file on the top level prevents the
1035 # pruning from going farther than the subdirectory containing first
1036 # and second.
1038 for path in ('full-prune/first',
1039 'full-prune-reappear/sub/first',
1040 'partial-prune/sub/first'):
1041 conv.logs[5].check_change('/%(trunk)s/' + path, 'D')
1043 for path in ('full-prune',
1044 'full-prune-reappear',
1045 'partial-prune/sub'):
1046 conv.logs[7].check_change('/%(trunk)s/' + path, 'D')
1048 for path in ('full-prune-reappear',
1049 'full-prune-reappear/appears-later'):
1050 conv.logs[33].check_change('/%(trunk)s/' + path, 'A')
1053 @Cvs2SvnTestFunction
1054 def interleaved_commits():
1055 "two interleaved trunk commits, different log msgs"
1056 # See test-data/main-cvsrepos/proj/README.
1057 conv = ensure_conversion('main')
1059 # The initial import.
1060 rev = 26
1061 conv.logs[rev].check('Initial import.', (
1062 ('/%(trunk)s/interleaved', 'A'),
1063 ('/%(trunk)s/interleaved/1', 'A'),
1064 ('/%(trunk)s/interleaved/2', 'A'),
1065 ('/%(trunk)s/interleaved/3', 'A'),
1066 ('/%(trunk)s/interleaved/4', 'A'),
1067 ('/%(trunk)s/interleaved/5', 'A'),
1068 ('/%(trunk)s/interleaved/a', 'A'),
1069 ('/%(trunk)s/interleaved/b', 'A'),
1070 ('/%(trunk)s/interleaved/c', 'A'),
1071 ('/%(trunk)s/interleaved/d', 'A'),
1072 ('/%(trunk)s/interleaved/e', 'A'),
1075 def check_letters(rev):
1076 """Check if REV is the rev where only letters were committed."""
1078 conv.logs[rev].check('Committing letters only.', (
1079 ('/%(trunk)s/interleaved/a', 'M'),
1080 ('/%(trunk)s/interleaved/b', 'M'),
1081 ('/%(trunk)s/interleaved/c', 'M'),
1082 ('/%(trunk)s/interleaved/d', 'M'),
1083 ('/%(trunk)s/interleaved/e', 'M'),
1086 def check_numbers(rev):
1087 """Check if REV is the rev where only numbers were committed."""
1089 conv.logs[rev].check('Committing numbers only.', (
1090 ('/%(trunk)s/interleaved/1', 'M'),
1091 ('/%(trunk)s/interleaved/2', 'M'),
1092 ('/%(trunk)s/interleaved/3', 'M'),
1093 ('/%(trunk)s/interleaved/4', 'M'),
1094 ('/%(trunk)s/interleaved/5', 'M'),
1097 # One of the commits was letters only, the other was numbers only.
1098 # But they happened "simultaneously", so we don't assume anything
1099 # about which commit appeared first, so we just try both ways.
1100 rev += 1
1101 try:
1102 check_letters(rev)
1103 check_numbers(rev + 1)
1104 except Failure:
1105 check_numbers(rev)
1106 check_letters(rev + 1)
1109 @Cvs2SvnTestFunction
1110 def simple_commits():
1111 "simple trunk commits"
1112 # See test-data/main-cvsrepos/proj/README.
1113 conv = ensure_conversion('main')
1115 # The initial import.
1116 conv.logs[13].check('Initial import.', (
1117 ('/%(trunk)s/proj', 'A'),
1118 ('/%(trunk)s/proj/default', 'A'),
1119 ('/%(trunk)s/proj/sub1', 'A'),
1120 ('/%(trunk)s/proj/sub1/default', 'A'),
1121 ('/%(trunk)s/proj/sub1/subsubA', 'A'),
1122 ('/%(trunk)s/proj/sub1/subsubA/default', 'A'),
1123 ('/%(trunk)s/proj/sub1/subsubB', 'A'),
1124 ('/%(trunk)s/proj/sub1/subsubB/default', 'A'),
1125 ('/%(trunk)s/proj/sub2', 'A'),
1126 ('/%(trunk)s/proj/sub2/default', 'A'),
1127 ('/%(trunk)s/proj/sub2/subsubA', 'A'),
1128 ('/%(trunk)s/proj/sub2/subsubA/default', 'A'),
1129 ('/%(trunk)s/proj/sub3', 'A'),
1130 ('/%(trunk)s/proj/sub3/default', 'A'),
1133 # The first commit.
1134 conv.logs[18].check('First commit to proj, affecting two files.', (
1135 ('/%(trunk)s/proj/sub1/subsubA/default', 'M'),
1136 ('/%(trunk)s/proj/sub3/default', 'M'),
1139 # The second commit.
1140 conv.logs[19].check('Second commit to proj, affecting all 7 files.', (
1141 ('/%(trunk)s/proj/default', 'M'),
1142 ('/%(trunk)s/proj/sub1/default', 'M'),
1143 ('/%(trunk)s/proj/sub1/subsubA/default', 'M'),
1144 ('/%(trunk)s/proj/sub1/subsubB/default', 'M'),
1145 ('/%(trunk)s/proj/sub2/default', 'M'),
1146 ('/%(trunk)s/proj/sub2/subsubA/default', 'M'),
1147 ('/%(trunk)s/proj/sub3/default', 'M')
1151 class SimpleTags(Cvs2SvnTestCase):
1152 "simple tags and branches, no commits"
1154 def __init__(self, **kw):
1155 # See test-data/main-cvsrepos/proj/README.
1156 Cvs2SvnTestCase.__init__(self, 'main', **kw)
1158 def run(self, sbox):
1159 conv = self.ensure_conversion()
1161 # Verify the copy source for the tags we are about to check
1162 # No need to verify the copyfrom revision, as simple_commits did that
1163 conv.logs[13].check('Initial import.', (
1164 ('/%(trunk)s/proj', 'A'),
1165 ('/%(trunk)s/proj/default', 'A'),
1166 ('/%(trunk)s/proj/sub1', 'A'),
1167 ('/%(trunk)s/proj/sub1/default', 'A'),
1168 ('/%(trunk)s/proj/sub1/subsubA', 'A'),
1169 ('/%(trunk)s/proj/sub1/subsubA/default', 'A'),
1170 ('/%(trunk)s/proj/sub1/subsubB', 'A'),
1171 ('/%(trunk)s/proj/sub1/subsubB/default', 'A'),
1172 ('/%(trunk)s/proj/sub2', 'A'),
1173 ('/%(trunk)s/proj/sub2/default', 'A'),
1174 ('/%(trunk)s/proj/sub2/subsubA', 'A'),
1175 ('/%(trunk)s/proj/sub2/subsubA/default', 'A'),
1176 ('/%(trunk)s/proj/sub3', 'A'),
1177 ('/%(trunk)s/proj/sub3/default', 'A'),
1180 # Tag on rev 1.1.1.1 of all files in proj
1181 conv.logs[16].check(sym_log_msg('B_FROM_INITIALS'), (
1182 ('/%(branches)s/B_FROM_INITIALS (from /%(trunk)s:13)', 'A'),
1183 ('/%(branches)s/B_FROM_INITIALS/single-files', 'D'),
1184 ('/%(branches)s/B_FROM_INITIALS/partial-prune', 'D'),
1187 # The same, as a tag
1188 log = conv.find_tag_log('T_ALL_INITIAL_FILES')
1189 log.check(sym_log_msg('T_ALL_INITIAL_FILES',1), (
1190 ('/%(tags)s/T_ALL_INITIAL_FILES (from /%(trunk)s:13)', 'A'),
1191 ('/%(tags)s/T_ALL_INITIAL_FILES/single-files', 'D'),
1192 ('/%(tags)s/T_ALL_INITIAL_FILES/partial-prune', 'D'),
1195 # Tag on rev 1.1.1.1 of all files in proj, except one
1196 log = conv.find_tag_log('T_ALL_INITIAL_FILES_BUT_ONE')
1197 log.check(sym_log_msg('T_ALL_INITIAL_FILES_BUT_ONE',1), (
1198 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE (from /%(trunk)s:13)', 'A'),
1199 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE/single-files', 'D'),
1200 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE/partial-prune', 'D'),
1201 ('/%(tags)s/T_ALL_INITIAL_FILES_BUT_ONE/proj/sub1/subsubB', 'D'),
1204 # The same, as a branch
1205 conv.logs[17].check(sym_log_msg('B_FROM_INITIALS_BUT_ONE'), (
1206 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE (from /%(trunk)s:13)', 'A'),
1207 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE/proj/sub1/subsubB', 'D'),
1208 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE/single-files', 'D'),
1209 ('/%(branches)s/B_FROM_INITIALS_BUT_ONE/partial-prune', 'D'),
1213 @Cvs2SvnTestFunction
1214 def simple_branch_commits():
1215 "simple branch commits"
1216 # See test-data/main-cvsrepos/proj/README.
1217 conv = ensure_conversion('main')
1219 conv.logs[23].check('Modify three files, on branch B_MIXED.', (
1220 ('/%(branches)s/B_MIXED/proj/default', 'M'),
1221 ('/%(branches)s/B_MIXED/proj/sub1/default', 'M'),
1222 ('/%(branches)s/B_MIXED/proj/sub2/subsubA/default', 'M'),
1226 @Cvs2SvnTestFunction
1227 def mixed_time_tag():
1228 "mixed-time tag"
1229 # See test-data/main-cvsrepos/proj/README.
1230 conv = ensure_conversion('main')
1232 log = conv.find_tag_log('T_MIXED')
1233 log.check_changes((
1234 ('/%(tags)s/T_MIXED (from /%(trunk)s:19)', 'A'),
1235 ('/%(tags)s/T_MIXED/single-files', 'D'),
1236 ('/%(tags)s/T_MIXED/partial-prune', 'D'),
1237 ('/%(tags)s/T_MIXED/proj/sub2/subsubA '
1238 '(from /%(trunk)s/proj/sub2/subsubA:13)', 'R'),
1239 ('/%(tags)s/T_MIXED/proj/sub3 (from /%(trunk)s/proj/sub3:18)', 'R'),
1243 @Cvs2SvnTestFunction
1244 def mixed_time_branch_with_added_file():
1245 "mixed-time branch, and a file added to the branch"
1246 # See test-data/main-cvsrepos/proj/README.
1247 conv = ensure_conversion('main')
1249 # A branch from the same place as T_MIXED in the previous test,
1250 # plus a file added directly to the branch
1251 conv.logs[21].check(sym_log_msg('B_MIXED'), (
1252 ('/%(branches)s/B_MIXED (from /%(trunk)s:19)', 'A'),
1253 ('/%(branches)s/B_MIXED/partial-prune', 'D'),
1254 ('/%(branches)s/B_MIXED/single-files', 'D'),
1255 ('/%(branches)s/B_MIXED/proj/sub2/subsubA '
1256 '(from /%(trunk)s/proj/sub2/subsubA:13)', 'R'),
1257 ('/%(branches)s/B_MIXED/proj/sub3 (from /%(trunk)s/proj/sub3:18)', 'R'),
1260 conv.logs[22].check('Add a file on branch B_MIXED.', (
1261 ('/%(branches)s/B_MIXED/proj/sub2/branch_B_MIXED_only', 'A'),
1265 @Cvs2SvnTestFunction
1266 def mixed_commit():
1267 "a commit affecting both trunk and a branch"
1268 # See test-data/main-cvsrepos/proj/README.
1269 conv = ensure_conversion('main')
1271 conv.logs[24].check(
1272 'A single commit affecting one file on branch B_MIXED '
1273 'and one on trunk.', (
1274 ('/%(trunk)s/proj/sub2/default', 'M'),
1275 ('/%(branches)s/B_MIXED/proj/sub2/branch_B_MIXED_only', 'M'),
1279 @Cvs2SvnTestFunction
1280 def split_time_branch():
1281 "branch some trunk files, and later branch the rest"
1282 # See test-data/main-cvsrepos/proj/README.
1283 conv = ensure_conversion('main')
1285 # First change on the branch, creating it
1286 conv.logs[25].check(sym_log_msg('B_SPLIT'), (
1287 ('/%(branches)s/B_SPLIT (from /%(trunk)s:24)', 'A'),
1288 ('/%(branches)s/B_SPLIT/partial-prune', 'D'),
1289 ('/%(branches)s/B_SPLIT/single-files', 'D'),
1290 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB', 'D'),
1293 conv.logs[29].check('First change on branch B_SPLIT.', (
1294 ('/%(branches)s/B_SPLIT/proj/default', 'M'),
1295 ('/%(branches)s/B_SPLIT/proj/sub1/default', 'M'),
1296 ('/%(branches)s/B_SPLIT/proj/sub1/subsubA/default', 'M'),
1297 ('/%(branches)s/B_SPLIT/proj/sub2/default', 'M'),
1298 ('/%(branches)s/B_SPLIT/proj/sub2/subsubA/default', 'M'),
1301 # A trunk commit for the file which was not branched
1302 conv.logs[30].check('A trunk change to sub1/subsubB/default. '
1303 'This was committed about an', (
1304 ('/%(trunk)s/proj/sub1/subsubB/default', 'M'),
1307 # Add the file not already branched to the branch, with modification:w
1308 conv.logs[31].check(sym_log_msg('B_SPLIT'), (
1309 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB '
1310 '(from /%(trunk)s/proj/sub1/subsubB:30)', 'A'),
1313 conv.logs[32].check('This change affects sub3/default and '
1314 'sub1/subsubB/default, on branch', (
1315 ('/%(branches)s/B_SPLIT/proj/sub1/subsubB/default', 'M'),
1316 ('/%(branches)s/B_SPLIT/proj/sub3/default', 'M'),
1320 @Cvs2SvnTestFunction
1321 def multiple_tags():
1322 "multiple tags referring to same revision"
1323 conv = ensure_conversion('main')
1324 if not conv.path_exists('tags', 'T_ALL_INITIAL_FILES', 'proj', 'default'):
1325 raise Failure()
1326 if not conv.path_exists(
1327 'tags', 'T_ALL_INITIAL_FILES_BUT_ONE', 'proj', 'default'):
1328 raise Failure()
1331 @Cvs2SvnTestFunction
1332 def multiply_defined_symbols():
1333 "multiple definitions of symbol names"
1335 # We can only check one line of the error output at a time, so test
1336 # twice. (The conversion only have to be done once because the
1337 # results are cached.)
1338 conv = ensure_conversion(
1339 'multiply-defined-symbols',
1340 error_re=(
1341 r"ERROR\: Multiple definitions of the symbol \'BRANCH\' .*\: "
1342 r"1\.2\.4 1\.2\.2"
1345 conv = ensure_conversion(
1346 'multiply-defined-symbols',
1347 error_re=(
1348 r"ERROR\: Multiple definitions of the symbol \'TAG\' .*\: "
1349 r"1\.2 1\.1"
1354 @Cvs2SvnTestFunction
1355 def multiply_defined_symbols_renamed():
1356 "rename multiply defined symbols"
1358 conv = ensure_conversion(
1359 'multiply-defined-symbols',
1360 options_file='cvs2svn-rename.options',
1364 @Cvs2SvnTestFunction
1365 def multiply_defined_symbols_ignored():
1366 "ignore multiply defined symbols"
1368 conv = ensure_conversion(
1369 'multiply-defined-symbols',
1370 options_file='cvs2svn-ignore.options',
1374 @Cvs2SvnTestFunction
1375 def repeatedly_defined_symbols():
1376 "multiple identical definitions of symbol names"
1378 # If a symbol is defined multiple times but has the same value each
1379 # time, that should not be an error.
1381 conv = ensure_conversion('repeatedly-defined-symbols')
1384 @Cvs2SvnTestFunction
1385 def bogus_tag():
1386 "conversion of invalid symbolic names"
1387 conv = ensure_conversion('bogus-tag')
1390 @Cvs2SvnTestFunction
1391 def overlapping_branch():
1392 "ignore a file with a branch with two names"
1393 conv = ensure_conversion('overlapping-branch')
1395 if not conv.output_found('.*cannot also have name \'vendorB\''):
1396 raise Failure()
1398 conv.logs[2].check('imported', (
1399 ('/%(trunk)s/nonoverlapping-branch', 'A'),
1400 ('/%(trunk)s/overlapping-branch', 'A'),
1403 if len(conv.logs) != 2:
1404 raise Failure()
1407 class PhoenixBranch(Cvs2SvnTestCase):
1408 "convert a branch file rooted in a 'dead' revision"
1410 def __init__(self, **kw):
1411 Cvs2SvnTestCase.__init__(self, 'phoenix', **kw)
1413 def run(self, sbox):
1414 conv = self.ensure_conversion()
1415 conv.logs[8].check('This file was supplied by Jack Moffitt', (
1416 ('/%(branches)s/volsung_20010721', 'A'),
1417 ('/%(branches)s/volsung_20010721/phoenix', 'A'),
1419 conv.logs[9].check('This file was supplied by Jack Moffitt', (
1420 ('/%(branches)s/volsung_20010721/phoenix', 'M'),
1424 ###TODO: We check for 4 changed paths here to accomodate creating tags
1425 ###and branches in rev 1, but that will change, so this will
1426 ###eventually change back.
1427 @Cvs2SvnTestFunction
1428 def ctrl_char_in_log():
1429 "handle a control char in a log message"
1430 # This was issue #1106.
1431 rev = 2
1432 conv = ensure_conversion('ctrl-char-in-log')
1433 conv.logs[rev].check_changes((
1434 ('/%(trunk)s/ctrl-char-in-log', 'A'),
1436 if conv.logs[rev].msg.find('\x04') < 0:
1437 raise Failure(
1438 "Log message of 'ctrl-char-in-log,v' (rev 2) is wrong.")
1441 @Cvs2SvnTestFunction
1442 def overdead():
1443 "handle tags rooted in a redeleted revision"
1444 conv = ensure_conversion('overdead')
1447 class NoTrunkPrune(Cvs2SvnTestCase):
1448 "ensure that trunk doesn't get pruned"
1450 def __init__(self, **kw):
1451 Cvs2SvnTestCase.__init__(self, 'overdead', **kw)
1453 def run(self, sbox):
1454 conv = self.ensure_conversion()
1455 for rev in conv.logs.keys():
1456 rev_logs = conv.logs[rev]
1457 if rev_logs.get_path_op('/%(trunk)s') == 'D':
1458 raise Failure()
1461 @Cvs2SvnTestFunction
1462 def double_delete():
1463 "file deleted twice, in the root of the repository"
1464 # This really tests several things: how we handle a file that's
1465 # removed (state 'dead') in two successive revisions; how we
1466 # handle a file in the root of the repository (there were some
1467 # bugs in cvs2svn's svn path construction for top-level files); and
1468 # the --no-prune option.
1469 conv = ensure_conversion(
1470 'double-delete', args=['--trunk-only', '--no-prune'])
1472 path = '/%(trunk)s/twice-removed'
1473 rev = 2
1474 conv.logs[rev].check('Updated CVS', (
1475 (path, 'A'),
1477 conv.logs[rev + 1].check('Remove this file for the first time.', (
1478 (path, 'D'),
1480 conv.logs[rev + 2].check('Remove this file for the second time,', (
1484 @Cvs2SvnTestFunction
1485 def split_branch():
1486 "branch created from both trunk and another branch"
1487 # See test-data/split-branch-cvsrepos/README.
1489 # The conversion will fail if the bug is present, and
1490 # ensure_conversion will raise Failure.
1491 conv = ensure_conversion('split-branch')
1494 @Cvs2SvnTestFunction
1495 def resync_misgroups():
1496 "resyncing should not misorder commit groups"
1497 # See test-data/resync-misgroups-cvsrepos/README.
1499 # The conversion will fail if the bug is present, and
1500 # ensure_conversion will raise Failure.
1501 conv = ensure_conversion('resync-misgroups')
1504 class TaggedBranchAndTrunk(Cvs2SvnTestCase):
1505 "allow tags with mixed trunk and branch sources"
1507 def __init__(self, **kw):
1508 Cvs2SvnTestCase.__init__(self, 'tagged-branch-n-trunk', **kw)
1510 def run(self, sbox):
1511 conv = self.ensure_conversion()
1513 tags = conv.symbols.get('tags', 'tags')
1515 a_path = conv.get_wc(tags, 'some-tag', 'a.txt')
1516 b_path = conv.get_wc(tags, 'some-tag', 'b.txt')
1517 if not (os.path.exists(a_path) and os.path.exists(b_path)):
1518 raise Failure()
1519 if (open(a_path, 'r').read().find('1.24') == -1) \
1520 or (open(b_path, 'r').read().find('1.5') == -1):
1521 raise Failure()
1524 @Cvs2SvnTestFunction
1525 def enroot_race():
1526 "never use the rev-in-progress as a copy source"
1528 # See issue #1427 and r8544.
1529 conv = ensure_conversion('enroot-race')
1530 rev = 6
1531 conv.logs[rev].check_changes((
1532 ('/%(branches)s/mybranch (from /%(trunk)s:5)', 'A'),
1533 ('/%(branches)s/mybranch/proj/a.txt', 'D'),
1534 ('/%(branches)s/mybranch/proj/b.txt', 'D'),
1536 conv.logs[rev + 1].check_changes((
1537 ('/%(branches)s/mybranch/proj/c.txt', 'M'),
1538 ('/%(trunk)s/proj/a.txt', 'M'),
1539 ('/%(trunk)s/proj/b.txt', 'M'),
1543 @Cvs2SvnTestFunction
1544 def enroot_race_obo():
1545 "do use the last completed rev as a copy source"
1546 conv = ensure_conversion('enroot-race-obo')
1547 conv.logs[3].check_change('/%(branches)s/BRANCH (from /%(trunk)s:2)', 'A')
1548 if not len(conv.logs) == 3:
1549 raise Failure()
1552 class BranchDeleteFirst(Cvs2SvnTestCase):
1553 "correctly handle deletion as initial branch action"
1555 def __init__(self, **kw):
1556 Cvs2SvnTestCase.__init__(self, 'branch-delete-first', **kw)
1558 def run(self, sbox):
1559 # See test-data/branch-delete-first-cvsrepos/README.
1561 # The conversion will fail if the bug is present, and
1562 # ensure_conversion would raise Failure.
1563 conv = self.ensure_conversion()
1565 branches = conv.symbols.get('branches', 'branches')
1567 # 'file' was deleted from branch-1 and branch-2, but not branch-3
1568 if conv.path_exists(branches, 'branch-1', 'file'):
1569 raise Failure()
1570 if conv.path_exists(branches, 'branch-2', 'file'):
1571 raise Failure()
1572 if not conv.path_exists(branches, 'branch-3', 'file'):
1573 raise Failure()
1576 @Cvs2SvnTestFunction
1577 def nonascii_filenames():
1578 "non ascii files converted incorrectly"
1579 # see issue #1255
1581 # on a en_US.iso-8859-1 machine this test fails with
1582 # svn: Can't recode ...
1584 # as described in the issue
1586 # on a en_US.UTF-8 machine this test fails with
1587 # svn: Malformed XML ...
1589 # which means at least it fails. Unfortunately it won't fail
1590 # with the same error...
1592 # mangle current locale settings so we know we're not running
1593 # a UTF-8 locale (which does not exhibit this problem)
1594 current_locale = locale.getlocale()
1595 new_locale = 'en_US.ISO8859-1'
1596 locale_changed = None
1598 # From http://docs.python.org/lib/module-sys.html
1600 # getfilesystemencoding():
1602 # Return the name of the encoding used to convert Unicode filenames
1603 # into system file names, or None if the system default encoding is
1604 # used. The result value depends on the operating system:
1606 # - On Windows 9x, the encoding is ``mbcs''.
1607 # - On Mac OS X, the encoding is ``utf-8''.
1608 # - On Unix, the encoding is the user's preference according to the
1609 # result of nl_langinfo(CODESET), or None if the
1610 # nl_langinfo(CODESET) failed.
1611 # - On Windows NT+, file names are Unicode natively, so no conversion is
1612 # performed.
1614 # So we're going to skip this test on Mac OS X for now.
1615 if sys.platform == "darwin":
1616 raise svntest.Skip()
1618 try:
1619 # change locale to non-UTF-8 locale to generate latin1 names
1620 locale.setlocale(locale.LC_ALL, # this might be too broad?
1621 new_locale)
1622 locale_changed = 1
1623 except locale.Error:
1624 raise svntest.Skip()
1626 try:
1627 srcrepos_path = os.path.join(test_data_dir,'main-cvsrepos')
1628 dstrepos_path = os.path.join(test_data_dir,'non-ascii-cvsrepos')
1629 if not os.path.exists(dstrepos_path):
1630 # create repos from existing main repos
1631 shutil.copytree(srcrepos_path, dstrepos_path)
1632 base_path = os.path.join(dstrepos_path, 'single-files')
1633 shutil.copyfile(os.path.join(base_path, 'twoquick,v'),
1634 os.path.join(base_path, 'two\366uick,v'))
1635 new_path = os.path.join(dstrepos_path, 'single\366files')
1636 os.rename(base_path, new_path)
1638 conv = ensure_conversion('non-ascii', args=['--encoding=latin1'])
1639 finally:
1640 if locale_changed:
1641 locale.setlocale(locale.LC_ALL, current_locale)
1642 safe_rmtree(dstrepos_path)
1645 class UnicodeTest(Cvs2SvnTestCase):
1646 "metadata contains Unicode"
1648 warning_pattern = r'ERROR\: There were warnings converting .* messages'
1650 def __init__(self, name, warning_expected, **kw):
1651 if warning_expected:
1652 error_re = self.warning_pattern
1653 else:
1654 error_re = None
1656 Cvs2SvnTestCase.__init__(self, name, error_re=error_re, **kw)
1657 self.warning_expected = warning_expected
1659 def run(self, sbox):
1660 try:
1661 # ensure the availability of the "utf_8" encoding:
1662 u'a'.encode('utf_8').decode('utf_8')
1663 except LookupError:
1664 raise svntest.Skip()
1666 self.ensure_conversion()
1669 class UnicodeAuthor(UnicodeTest):
1670 "author name contains Unicode"
1672 def __init__(self, warning_expected, **kw):
1673 UnicodeTest.__init__(self, 'unicode-author', warning_expected, **kw)
1676 class UnicodeLog(UnicodeTest):
1677 "log message contains Unicode"
1679 def __init__(self, warning_expected, **kw):
1680 UnicodeTest.__init__(self, 'unicode-log', warning_expected, **kw)
1683 @Cvs2SvnTestFunction
1684 def vendor_branch_sameness():
1685 "avoid spurious changes for initial revs"
1686 conv = ensure_conversion(
1687 'vendor-branch-sameness', args=['--keep-trivial-imports']
1690 # The following files are in this repository:
1692 # a.txt: Imported in the traditional way; 1.1 and 1.1.1.1 have
1693 # the same contents, the file's default branch is 1.1.1,
1694 # and both revisions are in state 'Exp'.
1696 # b.txt: Like a.txt, except that 1.1.1.1 has a real change from
1697 # 1.1 (the addition of a line of text).
1699 # c.txt: Like a.txt, except that 1.1.1.1 is in state 'dead'.
1701 # d.txt: This file was created by 'cvs add' instead of import, so
1702 # it has only 1.1 -- no 1.1.1.1, and no default branch.
1703 # The timestamp on the add is exactly the same as for the
1704 # imports of the other files.
1706 # e.txt: Like a.txt, except that the log message for revision 1.1
1707 # is not the standard import log message.
1709 # (Aside from e.txt, the log messages for the same revisions are the
1710 # same in all files.)
1712 # We expect that only a.txt is recognized as an import whose 1.1
1713 # revision can be omitted. The other files should be added on trunk
1714 # then filled to vbranchA, whereas a.txt should be added to vbranchA
1715 # then copied to trunk. In the copy of 1.1.1.1 back to trunk, a.txt
1716 # and e.txt should be copied untouched; b.txt should be 'M'odified,
1717 # and c.txt should be 'D'eleted.
1719 rev = 2
1720 conv.logs[rev].check('Initial revision', (
1721 ('/%(trunk)s/proj', 'A'),
1722 ('/%(trunk)s/proj/b.txt', 'A'),
1723 ('/%(trunk)s/proj/c.txt', 'A'),
1724 ('/%(trunk)s/proj/d.txt', 'A'),
1727 conv.logs[rev + 1].check(sym_log_msg('vbranchA'), (
1728 ('/%(branches)s/vbranchA (from /%(trunk)s:2)', 'A'),
1729 ('/%(branches)s/vbranchA/proj/d.txt', 'D'),
1732 conv.logs[rev + 2].check('First vendor branch revision.', (
1733 ('/%(branches)s/vbranchA/proj/a.txt', 'A'),
1734 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1735 ('/%(branches)s/vbranchA/proj/c.txt', 'D'),
1738 conv.logs[rev + 3].check('This commit was generated by cvs2svn '
1739 'to compensate for changes in r4,', (
1740 ('/%(trunk)s/proj/a.txt (from /%(branches)s/vbranchA/proj/a.txt:4)', 'A'),
1741 ('/%(trunk)s/proj/b.txt (from /%(branches)s/vbranchA/proj/b.txt:4)', 'R'),
1742 ('/%(trunk)s/proj/c.txt', 'D'),
1745 rev = 7
1746 conv.logs[rev].check('This log message is not the standard', (
1747 ('/%(trunk)s/proj/e.txt', 'A'),
1750 conv.logs[rev + 2].check('First vendor branch revision', (
1751 ('/%(branches)s/vbranchB/proj/e.txt', 'M'),
1754 conv.logs[rev + 3].check('This commit was generated by cvs2svn '
1755 'to compensate for changes in r9,', (
1756 ('/%(trunk)s/proj/e.txt (from /%(branches)s/vbranchB/proj/e.txt:9)', 'R'),
1760 @Cvs2SvnTestFunction
1761 def vendor_branch_trunk_only():
1762 "handle vendor branches with --trunk-only"
1763 conv = ensure_conversion('vendor-branch-sameness', args=['--trunk-only'])
1765 rev = 2
1766 conv.logs[rev].check('Initial revision', (
1767 ('/%(trunk)s/proj', 'A'),
1768 ('/%(trunk)s/proj/b.txt', 'A'),
1769 ('/%(trunk)s/proj/c.txt', 'A'),
1770 ('/%(trunk)s/proj/d.txt', 'A'),
1773 conv.logs[rev + 1].check('First vendor branch revision', (
1774 ('/%(trunk)s/proj/a.txt', 'A'),
1775 ('/%(trunk)s/proj/b.txt', 'M'),
1776 ('/%(trunk)s/proj/c.txt', 'D'),
1779 conv.logs[rev + 2].check('This log message is not the standard', (
1780 ('/%(trunk)s/proj/e.txt', 'A'),
1783 conv.logs[rev + 3].check('First vendor branch revision', (
1784 ('/%(trunk)s/proj/e.txt', 'M'),
1788 @Cvs2SvnTestFunction
1789 def default_branches():
1790 "handle default branches correctly"
1791 conv = ensure_conversion('default-branches')
1793 # There are seven files in the repository:
1795 # a.txt:
1796 # Imported in the traditional way, so 1.1 and 1.1.1.1 are the
1797 # same. Then 1.1.1.2 and 1.1.1.3 were imported, then 1.2
1798 # committed (thus losing the default branch "1.1.1"), then
1799 # 1.1.1.4 was imported. All vendor import release tags are
1800 # still present.
1802 # b.txt:
1803 # Like a.txt, but without rev 1.2.
1805 # c.txt:
1806 # Exactly like b.txt, just s/b.txt/c.txt/ in content.
1808 # d.txt:
1809 # Same as the previous two, but 1.1.1 branch is unlabeled.
1811 # e.txt:
1812 # Same, but missing 1.1.1 label and all tags but 1.1.1.3.
1814 # deleted-on-vendor-branch.txt,v:
1815 # Like b.txt and c.txt, except that 1.1.1.3 is state 'dead'.
1817 # added-then-imported.txt,v:
1818 # Added with 'cvs add' to create 1.1, then imported with
1819 # completely different contents to create 1.1.1.1, therefore
1820 # never had a default branch.
1823 conv.logs[2].check("Import (vbranchA, vtag-1).", (
1824 ('/%(branches)s/unlabeled-1.1.1', 'A'),
1825 ('/%(branches)s/unlabeled-1.1.1/proj', 'A'),
1826 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'A'),
1827 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'A'),
1828 ('/%(branches)s/vbranchA', 'A'),
1829 ('/%(branches)s/vbranchA/proj', 'A'),
1830 ('/%(branches)s/vbranchA/proj/a.txt', 'A'),
1831 ('/%(branches)s/vbranchA/proj/b.txt', 'A'),
1832 ('/%(branches)s/vbranchA/proj/c.txt', 'A'),
1833 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'A'),
1836 conv.logs[3].check("This commit was generated by cvs2svn "
1837 "to compensate for changes in r2,", (
1838 ('/%(trunk)s/proj', 'A'),
1839 ('/%(trunk)s/proj/a.txt (from /%(branches)s/vbranchA/proj/a.txt:2)', 'A'),
1840 ('/%(trunk)s/proj/b.txt (from /%(branches)s/vbranchA/proj/b.txt:2)', 'A'),
1841 ('/%(trunk)s/proj/c.txt (from /%(branches)s/vbranchA/proj/c.txt:2)', 'A'),
1842 ('/%(trunk)s/proj/d.txt '
1843 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:2)', 'A'),
1844 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1845 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:2)', 'A'),
1846 ('/%(trunk)s/proj/e.txt '
1847 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:2)', 'A'),
1850 conv.logs[4].check(sym_log_msg('vtag-1',1), (
1851 ('/%(tags)s/vtag-1 (from /%(branches)s/vbranchA:2)', 'A'),
1852 ('/%(tags)s/vtag-1/proj/d.txt '
1853 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:2)', 'A'),
1856 conv.logs[5].check("Import (vbranchA, vtag-2).", (
1857 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1858 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1859 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1860 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1861 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1862 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'M'),
1865 conv.logs[6].check("This commit was generated by cvs2svn "
1866 "to compensate for changes in r5,", (
1867 ('/%(trunk)s/proj/a.txt '
1868 '(from /%(branches)s/vbranchA/proj/a.txt:5)', 'R'),
1869 ('/%(trunk)s/proj/b.txt '
1870 '(from /%(branches)s/vbranchA/proj/b.txt:5)', 'R'),
1871 ('/%(trunk)s/proj/c.txt '
1872 '(from /%(branches)s/vbranchA/proj/c.txt:5)', 'R'),
1873 ('/%(trunk)s/proj/d.txt '
1874 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:5)', 'R'),
1875 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1876 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:5)',
1877 'R'),
1878 ('/%(trunk)s/proj/e.txt '
1879 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:5)', 'R'),
1882 conv.logs[7].check(sym_log_msg('vtag-2',1), (
1883 ('/%(tags)s/vtag-2 (from /%(branches)s/vbranchA:5)', 'A'),
1884 ('/%(tags)s/vtag-2/proj/d.txt '
1885 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:5)', 'A'),
1888 conv.logs[8].check("Import (vbranchA, vtag-3).", (
1889 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1890 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1891 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1892 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1893 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1894 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'D'),
1897 conv.logs[9].check("This commit was generated by cvs2svn "
1898 "to compensate for changes in r8,", (
1899 ('/%(trunk)s/proj/a.txt '
1900 '(from /%(branches)s/vbranchA/proj/a.txt:8)', 'R'),
1901 ('/%(trunk)s/proj/b.txt '
1902 '(from /%(branches)s/vbranchA/proj/b.txt:8)', 'R'),
1903 ('/%(trunk)s/proj/c.txt '
1904 '(from /%(branches)s/vbranchA/proj/c.txt:8)', 'R'),
1905 ('/%(trunk)s/proj/d.txt '
1906 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:8)', 'R'),
1907 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'D'),
1908 ('/%(trunk)s/proj/e.txt '
1909 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:8)', 'R'),
1912 conv.logs[10].check(sym_log_msg('vtag-3',1), (
1913 ('/%(tags)s/vtag-3 (from /%(branches)s/vbranchA:8)', 'A'),
1914 ('/%(tags)s/vtag-3/proj/d.txt '
1915 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:8)', 'A'),
1916 ('/%(tags)s/vtag-3/proj/e.txt '
1917 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:8)', 'A'),
1920 conv.logs[11].check("First regular commit, to a.txt, on vtag-3.", (
1921 ('/%(trunk)s/proj/a.txt', 'M'),
1924 conv.logs[12].check("Add a file to the working copy.", (
1925 ('/%(trunk)s/proj/added-then-imported.txt', 'A'),
1928 conv.logs[13].check(sym_log_msg('vbranchA'), (
1929 ('/%(branches)s/vbranchA/proj/added-then-imported.txt '
1930 '(from /%(trunk)s/proj/added-then-imported.txt:12)', 'A'),
1933 conv.logs[14].check("Import (vbranchA, vtag-4).", (
1934 ('/%(branches)s/unlabeled-1.1.1/proj/d.txt', 'M'),
1935 ('/%(branches)s/unlabeled-1.1.1/proj/e.txt', 'M'),
1936 ('/%(branches)s/vbranchA/proj/a.txt', 'M'),
1937 ('/%(branches)s/vbranchA/proj/added-then-imported.txt', 'M'), # CHECK!!!
1938 ('/%(branches)s/vbranchA/proj/b.txt', 'M'),
1939 ('/%(branches)s/vbranchA/proj/c.txt', 'M'),
1940 ('/%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt', 'A'),
1943 conv.logs[15].check("This commit was generated by cvs2svn "
1944 "to compensate for changes in r14,", (
1945 ('/%(trunk)s/proj/b.txt '
1946 '(from /%(branches)s/vbranchA/proj/b.txt:14)', 'R'),
1947 ('/%(trunk)s/proj/c.txt '
1948 '(from /%(branches)s/vbranchA/proj/c.txt:14)', 'R'),
1949 ('/%(trunk)s/proj/d.txt '
1950 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:14)', 'R'),
1951 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt '
1952 '(from /%(branches)s/vbranchA/proj/deleted-on-vendor-branch.txt:14)',
1953 'A'),
1954 ('/%(trunk)s/proj/e.txt '
1955 '(from /%(branches)s/unlabeled-1.1.1/proj/e.txt:14)', 'R'),
1958 conv.logs[16].check(sym_log_msg('vtag-4',1), (
1959 ('/%(tags)s/vtag-4 (from /%(branches)s/vbranchA:14)', 'A'),
1960 ('/%(tags)s/vtag-4/proj/d.txt '
1961 '(from /%(branches)s/unlabeled-1.1.1/proj/d.txt:14)', 'A'),
1965 @Cvs2SvnTestFunction
1966 def default_branches_trunk_only():
1967 "handle default branches with --trunk-only"
1969 conv = ensure_conversion('default-branches', args=['--trunk-only'])
1971 conv.logs[2].check("Import (vbranchA, vtag-1).", (
1972 ('/%(trunk)s/proj', 'A'),
1973 ('/%(trunk)s/proj/a.txt', 'A'),
1974 ('/%(trunk)s/proj/b.txt', 'A'),
1975 ('/%(trunk)s/proj/c.txt', 'A'),
1976 ('/%(trunk)s/proj/d.txt', 'A'),
1977 ('/%(trunk)s/proj/e.txt', 'A'),
1978 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'A'),
1981 conv.logs[3].check("Import (vbranchA, vtag-2).", (
1982 ('/%(trunk)s/proj/a.txt', 'M'),
1983 ('/%(trunk)s/proj/b.txt', 'M'),
1984 ('/%(trunk)s/proj/c.txt', 'M'),
1985 ('/%(trunk)s/proj/d.txt', 'M'),
1986 ('/%(trunk)s/proj/e.txt', 'M'),
1987 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'M'),
1990 conv.logs[4].check("Import (vbranchA, vtag-3).", (
1991 ('/%(trunk)s/proj/a.txt', 'M'),
1992 ('/%(trunk)s/proj/b.txt', 'M'),
1993 ('/%(trunk)s/proj/c.txt', 'M'),
1994 ('/%(trunk)s/proj/d.txt', 'M'),
1995 ('/%(trunk)s/proj/e.txt', 'M'),
1996 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'D'),
1999 conv.logs[5].check("First regular commit, to a.txt, on vtag-3.", (
2000 ('/%(trunk)s/proj/a.txt', 'M'),
2003 conv.logs[6].check("Add a file to the working copy.", (
2004 ('/%(trunk)s/proj/added-then-imported.txt', 'A'),
2007 conv.logs[7].check("Import (vbranchA, vtag-4).", (
2008 ('/%(trunk)s/proj/b.txt', 'M'),
2009 ('/%(trunk)s/proj/c.txt', 'M'),
2010 ('/%(trunk)s/proj/d.txt', 'M'),
2011 ('/%(trunk)s/proj/e.txt', 'M'),
2012 ('/%(trunk)s/proj/deleted-on-vendor-branch.txt', 'A'),
2016 @Cvs2SvnTestFunction
2017 def default_branch_and_1_2():
2018 "do not allow 1.2 revision with default branch"
2020 conv = ensure_conversion(
2021 'default-branch-and-1-2',
2022 error_re=(
2023 r'.*File \'.*\' has default branch=1\.1\.1 but also a revision 1\.2'
2028 @Cvs2SvnTestFunction
2029 def compose_tag_three_sources():
2030 "compose a tag from three sources"
2031 conv = ensure_conversion('compose-tag-three-sources')
2033 conv.logs[2].check("Add on trunk", (
2034 ('/%(trunk)s/tagged-on-trunk-1.1', 'A'),
2035 ('/%(trunk)s/tagged-on-trunk-1.2-a', 'A'),
2036 ('/%(trunk)s/tagged-on-trunk-1.2-b', 'A'),
2037 ('/%(trunk)s/tagged-on-b1', 'A'),
2038 ('/%(trunk)s/tagged-on-b2', 'A'),
2041 conv.logs[3].check(sym_log_msg('b1'), (
2042 ('/%(branches)s/b1 (from /%(trunk)s:2)', 'A'),
2045 conv.logs[4].check(sym_log_msg('b2'), (
2046 ('/%(branches)s/b2 (from /%(trunk)s:2)', 'A'),
2049 conv.logs[5].check("Commit on branch b1", (
2050 ('/%(branches)s/b1/tagged-on-trunk-1.1', 'M'),
2051 ('/%(branches)s/b1/tagged-on-trunk-1.2-a', 'M'),
2052 ('/%(branches)s/b1/tagged-on-trunk-1.2-b', 'M'),
2053 ('/%(branches)s/b1/tagged-on-b1', 'M'),
2054 ('/%(branches)s/b1/tagged-on-b2', 'M'),
2057 conv.logs[6].check("Commit on branch b2", (
2058 ('/%(branches)s/b2/tagged-on-trunk-1.1', 'M'),
2059 ('/%(branches)s/b2/tagged-on-trunk-1.2-a', 'M'),
2060 ('/%(branches)s/b2/tagged-on-trunk-1.2-b', 'M'),
2061 ('/%(branches)s/b2/tagged-on-b1', 'M'),
2062 ('/%(branches)s/b2/tagged-on-b2', 'M'),
2065 conv.logs[7].check("Commit again on trunk", (
2066 ('/%(trunk)s/tagged-on-trunk-1.2-a', 'M'),
2067 ('/%(trunk)s/tagged-on-trunk-1.2-b', 'M'),
2068 ('/%(trunk)s/tagged-on-trunk-1.1', 'M'),
2069 ('/%(trunk)s/tagged-on-b1', 'M'),
2070 ('/%(trunk)s/tagged-on-b2', 'M'),
2073 conv.logs[8].check(sym_log_msg('T',1), (
2074 ('/%(tags)s/T (from /%(trunk)s:7)', 'A'),
2075 ('/%(tags)s/T/tagged-on-trunk-1.1 '
2076 '(from /%(trunk)s/tagged-on-trunk-1.1:2)', 'R'),
2077 ('/%(tags)s/T/tagged-on-b1 (from /%(branches)s/b1/tagged-on-b1:5)', 'R'),
2078 ('/%(tags)s/T/tagged-on-b2 (from /%(branches)s/b2/tagged-on-b2:6)', 'R'),
2082 @Cvs2SvnTestFunction
2083 def pass5_when_to_fill():
2084 "reserve a svn revnum for a fill only when required"
2085 # The conversion will fail if the bug is present, and
2086 # ensure_conversion would raise Failure.
2087 conv = ensure_conversion('pass5-when-to-fill')
2090 class EmptyTrunk(Cvs2SvnTestCase):
2091 "don't break when the trunk is empty"
2093 def __init__(self, **kw):
2094 Cvs2SvnTestCase.__init__(self, 'empty-trunk', **kw)
2096 def run(self, sbox):
2097 # The conversion will fail if the bug is present, and
2098 # ensure_conversion would raise Failure.
2099 conv = self.ensure_conversion()
2102 @Cvs2SvnTestFunction
2103 def no_spurious_svn_commits():
2104 "ensure that we don't create any spurious commits"
2105 conv = ensure_conversion('phoenix')
2107 # Check spurious commit that could be created in
2108 # SVNCommitCreator._pre_commit()
2110 # (When you add a file on a branch, CVS creates a trunk revision
2111 # in state 'dead'. If the log message of that commit is equal to
2112 # the one that CVS generates, we do not ever create a 'fill'
2113 # SVNCommit for it.)
2115 # and spurious commit that could be created in
2116 # SVNCommitCreator._commit()
2118 # (When you add a file on a branch, CVS creates a trunk revision
2119 # in state 'dead'. If the log message of that commit is equal to
2120 # the one that CVS generates, we do not create a primary SVNCommit
2121 # for it.)
2122 conv.logs[17].check('File added on branch xiphophorus', (
2123 ('/%(branches)s/xiphophorus/added-on-branch.txt', 'A'),
2126 # Check to make sure that a commit *is* generated:
2127 # (When you add a file on a branch, CVS creates a trunk revision
2128 # in state 'dead'. If the log message of that commit is NOT equal
2129 # to the one that CVS generates, we create a primary SVNCommit to
2130 # serve as a home for the log message in question.
2131 conv.logs[18].check('file added-on-branch2.txt was initially added on '
2132 + 'branch xiphophorus,\nand this log message was tweaked', ())
2134 # Check spurious commit that could be created in
2135 # SVNCommitCreator._commit_symbols().
2136 conv.logs[19].check('This file was also added on branch xiphophorus,', (
2137 ('/%(branches)s/xiphophorus/added-on-branch2.txt', 'A'),
2141 class PeerPathPruning(Cvs2SvnTestCase):
2142 "make sure that filling prunes paths correctly"
2144 def __init__(self, **kw):
2145 Cvs2SvnTestCase.__init__(self, 'peer-path-pruning', **kw)
2147 def run(self, sbox):
2148 conv = self.ensure_conversion()
2149 conv.logs[6].check(sym_log_msg('BRANCH'), (
2150 ('/%(branches)s/BRANCH (from /%(trunk)s:4)', 'A'),
2151 ('/%(branches)s/BRANCH/bar', 'D'),
2152 ('/%(branches)s/BRANCH/foo (from /%(trunk)s/foo:5)', 'R'),
2156 @Cvs2SvnTestFunction
2157 def invalid_closings_on_trunk():
2158 "verify correct revs are copied to default branches"
2159 # The conversion will fail if the bug is present, and
2160 # ensure_conversion would raise Failure.
2161 conv = ensure_conversion('invalid-closings-on-trunk')
2164 @Cvs2SvnTestFunction
2165 def individual_passes():
2166 "run each pass individually"
2167 conv = ensure_conversion('main')
2168 conv2 = ensure_conversion('main', passbypass=1)
2170 if conv.logs != conv2.logs:
2171 raise Failure()
2174 @Cvs2SvnTestFunction
2175 def resync_bug():
2176 "reveal a big bug in our resync algorithm"
2177 # This will fail if the bug is present
2178 conv = ensure_conversion('resync-bug')
2181 @Cvs2SvnTestFunction
2182 def branch_from_default_branch():
2183 "reveal a bug in our default branch detection code"
2184 conv = ensure_conversion('branch-from-default-branch')
2186 # This revision will be a default branch synchronization only
2187 # if cvs2svn is correctly determining default branch revisions.
2189 # The bug was that cvs2svn was treating revisions on branches off of
2190 # default branches as default branch revisions, resulting in
2191 # incorrectly regarding the branch off of the default branch as a
2192 # non-trunk default branch. Crystal clear? I thought so. See
2193 # issue #42 for more incoherent blathering.
2194 conv.logs[5].check("This commit was generated by cvs2svn", (
2195 ('/%(trunk)s/proj/file.txt '
2196 '(from /%(branches)s/upstream/proj/file.txt:4)', 'R'),
2200 @Cvs2SvnTestFunction
2201 def file_in_attic_too():
2202 "die if a file exists in and out of the attic"
2203 ensure_conversion(
2204 'file-in-attic-too',
2205 error_re=(
2206 r'.*A CVS repository cannot contain both '
2207 r'(.*)' + re.escape(os.sep) + r'(.*) '
2208 + r'and '
2209 r'\1' + re.escape(os.sep) + r'Attic' + re.escape(os.sep) + r'\2'
2214 @Cvs2SvnTestFunction
2215 def retain_file_in_attic_too():
2216 "test --retain-conflicting-attic-files option"
2217 conv = ensure_conversion(
2218 'file-in-attic-too', args=['--retain-conflicting-attic-files'])
2219 if not conv.path_exists('trunk', 'file.txt'):
2220 raise Failure()
2221 if not conv.path_exists('trunk', 'Attic', 'file.txt'):
2222 raise Failure()
2225 @Cvs2SvnTestFunction
2226 def symbolic_name_filling_guide():
2227 "reveal a big bug in our SymbolFillingGuide"
2228 # This will fail if the bug is present
2229 conv = ensure_conversion('symbolic-name-overfill')
2232 # Helpers for tests involving file contents and properties.
2234 class NodeTreeWalkException:
2235 "Exception class for node tree traversals."
2236 pass
2238 def node_for_path(node, path):
2239 "In the tree rooted under SVNTree NODE, return the node at PATH."
2240 if node.name != '__SVN_ROOT_NODE':
2241 raise NodeTreeWalkException()
2242 path = path.strip('/')
2243 components = path.split('/')
2244 for component in components:
2245 node = svntest.tree.get_child(node, component)
2246 return node
2248 # Helper for tests involving properties.
2249 def props_for_path(node, path):
2250 "In the tree rooted under SVNTree NODE, return the prop dict for PATH."
2251 return node_for_path(node, path).props
2254 class EOLMime(Cvs2SvnPropertiesTestCase):
2255 """eol settings and mime types together
2257 The files are as follows:
2259 trunk/foo.txt: no -kb, mime file says nothing.
2260 trunk/foo.xml: no -kb, mime file says text.
2261 trunk/foo.zip: no -kb, mime file says non-text.
2262 trunk/foo.bin: has -kb, mime file says nothing.
2263 trunk/foo.csv: has -kb, mime file says text.
2264 trunk/foo.dbf: has -kb, mime file says non-text.
2267 def __init__(self, args, **kw):
2268 # TODO: It's a bit klugey to construct this path here. But so far
2269 # there's only one test with a mime.types file. If we have more,
2270 # we should abstract this into some helper, which would be located
2271 # near ensure_conversion(). Note that it is a convention of this
2272 # test suite for a mime.types file to be located in the top level
2273 # of the CVS repository to which it applies.
2274 self.mime_path = os.path.join(
2275 test_data_dir, 'eol-mime-cvsrepos', 'mime.types')
2277 Cvs2SvnPropertiesTestCase.__init__(
2278 self, 'eol-mime',
2279 props_to_test=['svn:eol-style', 'svn:mime-type', 'svn:keywords'],
2280 args=['--mime-types=%s' % self.mime_path] + args,
2281 **kw)
2284 # We do four conversions. Each time, we pass --mime-types=FILE with
2285 # the same FILE, but vary --default-eol and --eol-from-mime-type.
2286 # Thus there's one conversion with neither flag, one with just the
2287 # former, one with just the latter, and one with both.
2290 # Neither --no-default-eol nor --eol-from-mime-type:
2291 eol_mime1 = EOLMime(
2292 variant=1,
2293 args=[],
2294 expected_props=[
2295 ('trunk/foo.txt', [None, None, None]),
2296 ('trunk/foo.xml', [None, 'text/xml', None]),
2297 ('trunk/foo.zip', [None, 'application/zip', None]),
2298 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2299 ('trunk/foo.csv', [None, 'text/csv', None]),
2300 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2304 # Just --no-default-eol, not --eol-from-mime-type:
2305 eol_mime2 = EOLMime(
2306 variant=2,
2307 args=['--default-eol=native'],
2308 expected_props=[
2309 ('trunk/foo.txt', ['native', None, KEYWORDS]),
2310 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS]),
2311 ('trunk/foo.zip', ['native', 'application/zip', KEYWORDS]),
2312 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2313 ('trunk/foo.csv', [None, 'text/csv', None]),
2314 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2318 # Just --eol-from-mime-type, not --no-default-eol:
2319 eol_mime3 = EOLMime(
2320 variant=3,
2321 args=['--eol-from-mime-type'],
2322 expected_props=[
2323 ('trunk/foo.txt', [None, None, None]),
2324 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS]),
2325 ('trunk/foo.zip', [None, 'application/zip', None]),
2326 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2327 ('trunk/foo.csv', [None, 'text/csv', None]),
2328 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2332 # Both --no-default-eol and --eol-from-mime-type:
2333 eol_mime4 = EOLMime(
2334 variant=4,
2335 args=['--eol-from-mime-type', '--default-eol=native'],
2336 expected_props=[
2337 ('trunk/foo.txt', ['native', None, KEYWORDS]),
2338 ('trunk/foo.xml', ['native', 'text/xml', KEYWORDS]),
2339 ('trunk/foo.zip', [None, 'application/zip', None]),
2340 ('trunk/foo.bin', [None, 'application/octet-stream', None]),
2341 ('trunk/foo.csv', [None, 'text/csv', None]),
2342 ('trunk/foo.dbf', [None, 'application/what-is-dbf', None]),
2346 cvs_revnums_off = Cvs2SvnPropertiesTestCase(
2347 'eol-mime',
2348 doc='test non-setting of cvs2svn:cvs-rev property',
2349 args=[],
2350 props_to_test=['cvs2svn:cvs-rev'],
2351 expected_props=[
2352 ('trunk/foo.txt', [None]),
2353 ('trunk/foo.xml', [None]),
2354 ('trunk/foo.zip', [None]),
2355 ('trunk/foo.bin', [None]),
2356 ('trunk/foo.csv', [None]),
2357 ('trunk/foo.dbf', [None]),
2361 cvs_revnums_on = Cvs2SvnPropertiesTestCase(
2362 'eol-mime',
2363 doc='test setting of cvs2svn:cvs-rev property',
2364 args=['--cvs-revnums'],
2365 props_to_test=['cvs2svn:cvs-rev'],
2366 expected_props=[
2367 ('trunk/foo.txt', ['1.2']),
2368 ('trunk/foo.xml', ['1.2']),
2369 ('trunk/foo.zip', ['1.2']),
2370 ('trunk/foo.bin', ['1.2']),
2371 ('trunk/foo.csv', ['1.2']),
2372 ('trunk/foo.dbf', ['1.2']),
2376 keywords = Cvs2SvnPropertiesTestCase(
2377 'keywords',
2378 doc='test setting of svn:keywords property among others',
2379 args=['--default-eol=native'],
2380 props_to_test=['svn:keywords', 'svn:eol-style', 'svn:mime-type'],
2381 expected_props=[
2382 ('trunk/foo.default', [KEYWORDS, 'native', None]),
2383 ('trunk/foo.kkvl', [KEYWORDS, 'native', None]),
2384 ('trunk/foo.kkv', [KEYWORDS, 'native', None]),
2385 ('trunk/foo.kb', [None, None, 'application/octet-stream']),
2386 ('trunk/foo.kk', [None, 'native', None]),
2387 ('trunk/foo.ko', [None, 'native', None]),
2388 ('trunk/foo.kv', [None, 'native', None]),
2392 @Cvs2SvnTestFunction
2393 def ignore():
2394 "test setting of svn:ignore property"
2395 conv = ensure_conversion('cvsignore')
2396 wc_tree = conv.get_wc_tree()
2397 topdir_props = props_for_path(wc_tree, 'trunk/proj')
2398 subdir_props = props_for_path(wc_tree, '/trunk/proj/subdir')
2400 if topdir_props['svn:ignore'] != \
2401 '*.idx\n*.aux\n*.dvi\n*.log\nfoo\nbar\nbaz\nqux\n':
2402 raise Failure()
2404 if subdir_props['svn:ignore'] != \
2405 '*.idx\n*.aux\n*.dvi\n*.log\nfoo\nbar\nbaz\nqux\n':
2406 raise Failure()
2409 @Cvs2SvnTestFunction
2410 def requires_cvs():
2411 "test that CVS can still do what RCS can't"
2412 # See issues 4, 11, 29 for the bugs whose regression we're testing for.
2413 conv = ensure_conversion(
2414 'requires-cvs', args=['--use-cvs', '--default-eol=native'],
2417 atsign_contents = file(conv.get_wc("trunk", "atsign-add")).read()
2418 cl_contents = file(conv.get_wc("trunk", "client_lock.idl")).read()
2420 if atsign_contents[-1:] == "@":
2421 raise Failure()
2422 if cl_contents.find("gregh\n//\n//Integration for locks") < 0:
2423 raise Failure()
2425 if not (conv.logs[6].author == "William Lyon Phelps III" and
2426 conv.logs[5].author == "j random"):
2427 raise Failure()
2430 @Cvs2SvnTestFunction
2431 def questionable_branch_names():
2432 "test that we can handle weird branch names"
2433 conv = ensure_conversion('questionable-symbols')
2434 # If the conversion succeeds, then we're okay. We could check the
2435 # actual branch paths, too, but the main thing is to know that the
2436 # conversion doesn't fail.
2439 @Cvs2SvnTestFunction
2440 def questionable_tag_names():
2441 "test that we can handle weird tag names"
2442 conv = ensure_conversion('questionable-symbols')
2443 conv.find_tag_log('Tag_A').check(sym_log_msg('Tag_A', 1), (
2444 ('/%(tags)s/Tag_A (from /trunk:8)', 'A'),
2446 conv.find_tag_log('TagWith/Backslash_E').check(
2447 sym_log_msg('TagWith/Backslash_E',1),
2449 ('/%(tags)s/TagWith', 'A'),
2450 ('/%(tags)s/TagWith/Backslash_E (from /trunk:8)', 'A'),
2453 conv.find_tag_log('TagWith/Slash_Z').check(
2454 sym_log_msg('TagWith/Slash_Z',1),
2456 ('/%(tags)s/TagWith/Slash_Z (from /trunk:8)', 'A'),
2461 @Cvs2SvnTestFunction
2462 def revision_reorder_bug():
2463 "reveal a bug that reorders file revisions"
2464 conv = ensure_conversion('revision-reorder-bug')
2465 # If the conversion succeeds, then we're okay. We could check the
2466 # actual revisions, too, but the main thing is to know that the
2467 # conversion doesn't fail.
2470 @Cvs2SvnTestFunction
2471 def exclude():
2472 "test that exclude really excludes everything"
2473 conv = ensure_conversion('main', args=['--exclude=.*'])
2474 for log in conv.logs.values():
2475 for item in log.changed_paths.keys():
2476 if item.startswith('/branches/') or item.startswith('/tags/'):
2477 raise Failure()
2480 @Cvs2SvnTestFunction
2481 def vendor_branch_delete_add():
2482 "add trunk file that was deleted on vendor branch"
2483 # This will error if the bug is present
2484 conv = ensure_conversion('vendor-branch-delete-add')
2487 @Cvs2SvnTestFunction
2488 def resync_pass2_pull_forward():
2489 "ensure pass2 doesn't pull rev too far forward"
2490 conv = ensure_conversion('resync-pass2-pull-forward')
2491 # If the conversion succeeds, then we're okay. We could check the
2492 # actual revisions, too, but the main thing is to know that the
2493 # conversion doesn't fail.
2496 @Cvs2SvnTestFunction
2497 def native_eol():
2498 "only LFs for svn:eol-style=native files"
2499 conv = ensure_conversion('native-eol', args=['--default-eol=native'])
2500 lines = run_program(svntest.main.svnadmin_binary, None, 'dump', '-q',
2501 conv.repos)
2502 # Verify that all files in the dump have LF EOLs. We're actually
2503 # testing the whole dump file, but the dump file itself only uses
2504 # LF EOLs, so we're safe.
2505 for line in lines:
2506 if line[-1] != '\n' or line[:-1].find('\r') != -1:
2507 raise Failure()
2510 @Cvs2SvnTestFunction
2511 def double_fill():
2512 "reveal a bug that created a branch twice"
2513 conv = ensure_conversion('double-fill')
2514 # If the conversion succeeds, then we're okay. We could check the
2515 # actual revisions, too, but the main thing is to know that the
2516 # conversion doesn't fail.
2519 @Cvs2SvnTestFunction
2520 def double_fill2():
2521 "reveal a second bug that created a branch twice"
2522 conv = ensure_conversion('double-fill2')
2523 conv.logs[6].check_msg(sym_log_msg('BRANCH1'))
2524 conv.logs[7].check_msg(sym_log_msg('BRANCH2'))
2525 try:
2526 # This check should fail:
2527 conv.logs[8].check_msg(sym_log_msg('BRANCH2'))
2528 except Failure:
2529 pass
2530 else:
2531 raise Failure('Symbol filled twice in a row')
2534 @Cvs2SvnTestFunction
2535 def resync_pass2_push_backward():
2536 "ensure pass2 doesn't push rev too far backward"
2537 conv = ensure_conversion('resync-pass2-push-backward')
2538 # If the conversion succeeds, then we're okay. We could check the
2539 # actual revisions, too, but the main thing is to know that the
2540 # conversion doesn't fail.
2543 @Cvs2SvnTestFunction
2544 def double_add():
2545 "reveal a bug that added a branch file twice"
2546 conv = ensure_conversion('double-add')
2547 # If the conversion succeeds, then we're okay. We could check the
2548 # actual revisions, too, but the main thing is to know that the
2549 # conversion doesn't fail.
2552 @Cvs2SvnTestFunction
2553 def bogus_branch_copy():
2554 "reveal a bug that copies a branch file wrongly"
2555 conv = ensure_conversion('bogus-branch-copy')
2556 # If the conversion succeeds, then we're okay. We could check the
2557 # actual revisions, too, but the main thing is to know that the
2558 # conversion doesn't fail.
2561 @Cvs2SvnTestFunction
2562 def nested_ttb_directories():
2563 "require error if ttb directories are not disjoint"
2564 opts_list = [
2565 {'trunk' : 'a', 'branches' : 'a',},
2566 {'trunk' : 'a', 'tags' : 'a',},
2567 {'branches' : 'a', 'tags' : 'a',},
2568 # This option conflicts with the default trunk path:
2569 {'branches' : 'trunk',},
2570 # Try some nested directories:
2571 {'trunk' : 'a', 'branches' : 'a/b',},
2572 {'trunk' : 'a/b', 'tags' : 'a/b/c/d',},
2573 {'branches' : 'a', 'tags' : 'a/b',},
2576 for opts in opts_list:
2577 ensure_conversion(
2578 'main', error_re=r'The following paths are not disjoint\:', **opts
2582 class AutoProps(Cvs2SvnPropertiesTestCase):
2583 """Test auto-props.
2585 The files are as follows:
2587 trunk/foo.txt: no -kb, mime auto-prop says nothing.
2588 trunk/foo.xml: no -kb, mime auto-prop says text and eol-style=CRLF.
2589 trunk/foo.zip: no -kb, mime auto-prop says non-text.
2590 trunk/foo.asc: no -kb, mime auto-prop says text and eol-style=<unset>.
2591 trunk/foo.bin: has -kb, mime auto-prop says nothing.
2592 trunk/foo.csv: has -kb, mime auto-prop says text and eol-style=CRLF.
2593 trunk/foo.dbf: has -kb, mime auto-prop says non-text.
2594 trunk/foo.UPCASE1: no -kb, no mime type.
2595 trunk/foo.UPCASE2: no -kb, no mime type.
2598 def __init__(self, args, **kw):
2599 ### TODO: It's a bit klugey to construct this path here. See also
2600 ### the comment in eol_mime().
2601 auto_props_path = os.path.join(
2602 test_data_dir, 'eol-mime-cvsrepos', 'auto-props')
2604 Cvs2SvnPropertiesTestCase.__init__(
2605 self, 'eol-mime',
2606 props_to_test=[
2607 'myprop',
2608 'svn:eol-style',
2609 'svn:mime-type',
2610 'svn:keywords',
2611 'svn:executable',
2613 args=[
2614 '--auto-props=%s' % auto_props_path,
2615 '--eol-from-mime-type'
2616 ] + args,
2617 **kw)
2620 auto_props_ignore_case = AutoProps(
2621 doc="test auto-props",
2622 args=['--default-eol=native'],
2623 expected_props=[
2624 ('trunk/foo.txt', ['txt', 'native', None, KEYWORDS, None]),
2625 ('trunk/foo.xml', ['xml', 'CRLF', 'text/xml', KEYWORDS, None]),
2626 ('trunk/foo.zip', ['zip', None, 'application/zip', None, None]),
2627 ('trunk/foo.asc', ['asc', None, 'text/plain', None, None]),
2628 ('trunk/foo.bin',
2629 ['bin', None, 'application/octet-stream', None, '']),
2630 ('trunk/foo.csv', ['csv', 'CRLF', 'text/csv', None, None]),
2631 ('trunk/foo.dbf',
2632 ['dbf', None, 'application/what-is-dbf', None, None]),
2633 ('trunk/foo.UPCASE1', ['UPCASE1', 'native', None, KEYWORDS, None]),
2634 ('trunk/foo.UPCASE2', ['UPCASE2', 'native', None, KEYWORDS, None]),
2638 @Cvs2SvnTestFunction
2639 def ctrl_char_in_filename():
2640 "do not allow control characters in filenames"
2642 try:
2643 srcrepos_path = os.path.join(test_data_dir,'main-cvsrepos')
2644 dstrepos_path = os.path.join(test_data_dir,'ctrl-char-filename-cvsrepos')
2645 if os.path.exists(dstrepos_path):
2646 safe_rmtree(dstrepos_path)
2648 # create repos from existing main repos
2649 shutil.copytree(srcrepos_path, dstrepos_path)
2650 base_path = os.path.join(dstrepos_path, 'single-files')
2651 try:
2652 shutil.copyfile(os.path.join(base_path, 'twoquick,v'),
2653 os.path.join(base_path, 'two\rquick,v'))
2654 except:
2655 # Operating systems that don't allow control characters in
2656 # filenames will hopefully have thrown an exception; in that
2657 # case, just skip this test.
2658 raise svntest.Skip()
2660 conv = ensure_conversion(
2661 'ctrl-char-filename',
2662 error_re=(r'.*Subversion does not allow character .*.'),
2664 finally:
2665 safe_rmtree(dstrepos_path)
2668 @Cvs2SvnTestFunction
2669 def commit_dependencies():
2670 "interleaved and multi-branch commits to same files"
2671 conv = ensure_conversion("commit-dependencies")
2672 conv.logs[2].check('adding', (
2673 ('/%(trunk)s/interleaved', 'A'),
2674 ('/%(trunk)s/interleaved/file1', 'A'),
2675 ('/%(trunk)s/interleaved/file2', 'A'),
2677 conv.logs[3].check('big commit', (
2678 ('/%(trunk)s/interleaved/file1', 'M'),
2679 ('/%(trunk)s/interleaved/file2', 'M'),
2681 conv.logs[4].check('dependant small commit', (
2682 ('/%(trunk)s/interleaved/file1', 'M'),
2684 conv.logs[5].check('adding', (
2685 ('/%(trunk)s/multi-branch', 'A'),
2686 ('/%(trunk)s/multi-branch/file1', 'A'),
2687 ('/%(trunk)s/multi-branch/file2', 'A'),
2689 conv.logs[6].check(sym_log_msg("branch"), (
2690 ('/%(branches)s/branch (from /%(trunk)s:5)', 'A'),
2691 ('/%(branches)s/branch/interleaved', 'D'),
2693 conv.logs[7].check('multi-branch-commit', (
2694 ('/%(trunk)s/multi-branch/file1', 'M'),
2695 ('/%(trunk)s/multi-branch/file2', 'M'),
2696 ('/%(branches)s/branch/multi-branch/file1', 'M'),
2697 ('/%(branches)s/branch/multi-branch/file2', 'M'),
2701 @Cvs2SvnTestFunction
2702 def double_branch_delete():
2703 "fill branches before modifying files on them"
2704 conv = ensure_conversion('double-branch-delete')
2706 # Test for issue #102. The file IMarshalledValue.java is branched,
2707 # deleted, readded on the branch, and then deleted again. If the
2708 # fill for the file on the branch is postponed until after the
2709 # modification, the file will end up live on the branch instead of
2710 # dead! Make sure it happens at the right time.
2712 conv.logs[6].check('JBAS-2436 - Adding LGPL Header2', (
2713 ('/%(branches)s/Branch_4_0/IMarshalledValue.java', 'A'),
2716 conv.logs[7].check('JBAS-3025 - Removing dependency', (
2717 ('/%(branches)s/Branch_4_0/IMarshalledValue.java', 'D'),
2721 @Cvs2SvnTestFunction
2722 def symbol_mismatches():
2723 "error for conflicting tag/branch"
2725 ensure_conversion(
2726 'symbol-mess',
2727 args=['--symbol-default=strict'],
2728 error_re=r'.*Problems determining how symbols should be converted',
2732 @Cvs2SvnTestFunction
2733 def overlook_symbol_mismatches():
2734 "overlook conflicting tag/branch when --trunk-only"
2736 # This is a test for issue #85.
2738 ensure_conversion('symbol-mess', args=['--trunk-only'])
2741 @Cvs2SvnTestFunction
2742 def force_symbols():
2743 "force symbols to be tags/branches"
2745 conv = ensure_conversion(
2746 'symbol-mess',
2747 args=['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG'])
2748 if conv.path_exists('tags', 'BRANCH') \
2749 or not conv.path_exists('branches', 'BRANCH'):
2750 raise Failure()
2751 if not conv.path_exists('tags', 'TAG') \
2752 or conv.path_exists('branches', 'TAG'):
2753 raise Failure()
2754 if conv.path_exists('tags', 'MOSTLY_BRANCH') \
2755 or not conv.path_exists('branches', 'MOSTLY_BRANCH'):
2756 raise Failure()
2757 if not conv.path_exists('tags', 'MOSTLY_TAG') \
2758 or conv.path_exists('branches', 'MOSTLY_TAG'):
2759 raise Failure()
2762 @Cvs2SvnTestFunction
2763 def commit_blocks_tags():
2764 "commit prevents forced tag"
2766 basic_args = ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2767 ensure_conversion(
2768 'symbol-mess',
2769 args=(basic_args + ['--force-tag=BRANCH_WITH_COMMIT']),
2770 error_re=(
2771 r'.*The following branches cannot be forced to be tags '
2772 r'because they have commits'
2777 @Cvs2SvnTestFunction
2778 def blocked_excludes():
2779 "error for blocked excludes"
2781 basic_args = ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2782 for blocker in ['BRANCH', 'COMMIT', 'UNNAMED']:
2783 try:
2784 ensure_conversion(
2785 'symbol-mess',
2786 args=(basic_args + ['--exclude=BLOCKED_BY_%s' % blocker]))
2787 raise MissingErrorException()
2788 except Failure:
2789 pass
2792 @Cvs2SvnTestFunction
2793 def unblock_blocked_excludes():
2794 "excluding blocker removes blockage"
2796 basic_args = ['--force-branch=MOSTLY_BRANCH', '--force-tag=MOSTLY_TAG']
2797 for blocker in ['BRANCH', 'COMMIT']:
2798 ensure_conversion(
2799 'symbol-mess',
2800 args=(basic_args + ['--exclude=BLOCKED_BY_%s' % blocker,
2801 '--exclude=BLOCKING_%s' % blocker]))
2804 @Cvs2SvnTestFunction
2805 def regexp_force_symbols():
2806 "force symbols via regular expressions"
2808 conv = ensure_conversion(
2809 'symbol-mess',
2810 args=['--force-branch=MOST.*_BRANCH', '--force-tag=MOST.*_TAG'])
2811 if conv.path_exists('tags', 'MOSTLY_BRANCH') \
2812 or not conv.path_exists('branches', 'MOSTLY_BRANCH'):
2813 raise Failure()
2814 if not conv.path_exists('tags', 'MOSTLY_TAG') \
2815 or conv.path_exists('branches', 'MOSTLY_TAG'):
2816 raise Failure()
2819 @Cvs2SvnTestFunction
2820 def heuristic_symbol_default():
2821 "test 'heuristic' symbol default"
2823 conv = ensure_conversion(
2824 'symbol-mess', args=['--symbol-default=heuristic'])
2825 if conv.path_exists('tags', 'MOSTLY_BRANCH') \
2826 or not conv.path_exists('branches', 'MOSTLY_BRANCH'):
2827 raise Failure()
2828 if not conv.path_exists('tags', 'MOSTLY_TAG') \
2829 or conv.path_exists('branches', 'MOSTLY_TAG'):
2830 raise Failure()
2833 @Cvs2SvnTestFunction
2834 def branch_symbol_default():
2835 "test 'branch' symbol default"
2837 conv = ensure_conversion(
2838 'symbol-mess', args=['--symbol-default=branch'])
2839 if conv.path_exists('tags', 'MOSTLY_BRANCH') \
2840 or not conv.path_exists('branches', 'MOSTLY_BRANCH'):
2841 raise Failure()
2842 if conv.path_exists('tags', 'MOSTLY_TAG') \
2843 or not conv.path_exists('branches', 'MOSTLY_TAG'):
2844 raise Failure()
2847 @Cvs2SvnTestFunction
2848 def tag_symbol_default():
2849 "test 'tag' symbol default"
2851 conv = ensure_conversion(
2852 'symbol-mess', args=['--symbol-default=tag'])
2853 if not conv.path_exists('tags', 'MOSTLY_BRANCH') \
2854 or conv.path_exists('branches', 'MOSTLY_BRANCH'):
2855 raise Failure()
2856 if not conv.path_exists('tags', 'MOSTLY_TAG') \
2857 or conv.path_exists('branches', 'MOSTLY_TAG'):
2858 raise Failure()
2861 @Cvs2SvnTestFunction
2862 def symbol_transform():
2863 "test --symbol-transform"
2865 conv = ensure_conversion(
2866 'symbol-mess',
2867 args=[
2868 '--symbol-default=heuristic',
2869 '--symbol-transform=BRANCH:branch',
2870 '--symbol-transform=TAG:tag',
2871 '--symbol-transform=MOSTLY_(BRANCH|TAG):MOSTLY.\\1',
2873 if not conv.path_exists('branches', 'branch'):
2874 raise Failure()
2875 if not conv.path_exists('tags', 'tag'):
2876 raise Failure()
2877 if not conv.path_exists('branches', 'MOSTLY.BRANCH'):
2878 raise Failure()
2879 if not conv.path_exists('tags', 'MOSTLY.TAG'):
2880 raise Failure()
2883 @Cvs2SvnTestFunction
2884 def write_symbol_info():
2885 "test --write-symbol-info"
2887 expected_lines = [
2888 ['0', '.trunk.',
2889 'trunk', 'trunk', '.'],
2890 ['0', 'BLOCKED_BY_UNNAMED',
2891 'branch', 'branches/BLOCKED_BY_UNNAMED', '.trunk.'],
2892 ['0', 'BLOCKING_COMMIT',
2893 'branch', 'branches/BLOCKING_COMMIT', 'BLOCKED_BY_COMMIT'],
2894 ['0', 'BLOCKED_BY_COMMIT',
2895 'branch', 'branches/BLOCKED_BY_COMMIT', '.trunk.'],
2896 ['0', 'BLOCKING_BRANCH',
2897 'branch', 'branches/BLOCKING_BRANCH', 'BLOCKED_BY_BRANCH'],
2898 ['0', 'BLOCKED_BY_BRANCH',
2899 'branch', 'branches/BLOCKED_BY_BRANCH', '.trunk.'],
2900 ['0', 'MOSTLY_BRANCH',
2901 '.', '.', '.'],
2902 ['0', 'MOSTLY_TAG',
2903 '.', '.', '.'],
2904 ['0', 'BRANCH_WITH_COMMIT',
2905 'branch', 'branches/BRANCH_WITH_COMMIT', '.trunk.'],
2906 ['0', 'BRANCH',
2907 'branch', 'branches/BRANCH', '.trunk.'],
2908 ['0', 'TAG',
2909 'tag', 'tags/TAG', '.trunk.'],
2910 ['0', 'unlabeled-1.1.12.1.2',
2911 'branch', 'branches/unlabeled-1.1.12.1.2', 'BLOCKED_BY_UNNAMED'],
2913 expected_lines.sort()
2915 symbol_info_file = os.path.join(tmp_dir, 'symbol-mess-symbol-info.txt')
2916 try:
2917 ensure_conversion(
2918 'symbol-mess',
2919 args=[
2920 '--symbol-default=strict',
2921 '--write-symbol-info=%s' % (symbol_info_file,),
2922 '--passes=:CollateSymbolsPass',
2925 raise MissingErrorException()
2926 except Failure:
2927 pass
2928 lines = []
2929 comment_re = re.compile(r'^\s*\#')
2930 for l in open(symbol_info_file, 'r'):
2931 if comment_re.match(l):
2932 continue
2933 lines.append(l.strip().split())
2934 lines.sort()
2935 if lines != expected_lines:
2936 s = ['Symbol info incorrect\n']
2937 differ = Differ()
2938 for diffline in differ.compare(
2939 [' '.join(line) + '\n' for line in expected_lines],
2940 [' '.join(line) + '\n' for line in lines],
2942 s.append(diffline)
2943 raise Failure(''.join(s))
2946 @Cvs2SvnTestFunction
2947 def symbol_hints():
2948 "test --symbol-hints for setting branch/tag"
2950 conv = ensure_conversion(
2951 'symbol-mess', symbol_hints_file='symbol-mess-symbol-hints.txt',
2953 if not conv.path_exists('branches', 'MOSTLY_BRANCH'):
2954 raise Failure()
2955 if not conv.path_exists('tags', 'MOSTLY_TAG'):
2956 raise Failure()
2957 conv.logs[3].check(sym_log_msg('MOSTLY_TAG', 1), (
2958 ('/tags/MOSTLY_TAG (from /trunk:2)', 'A'),
2960 conv.logs[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
2961 ('/branches/BRANCH_WITH_COMMIT (from /trunk:2)', 'A'),
2963 conv.logs[10].check(sym_log_msg('MOSTLY_BRANCH'), (
2964 ('/branches/MOSTLY_BRANCH (from /trunk:2)', 'A'),
2968 @Cvs2SvnTestFunction
2969 def parent_hints():
2970 "test --symbol-hints for setting parent"
2972 conv = ensure_conversion(
2973 'symbol-mess', symbol_hints_file='symbol-mess-parent-hints.txt',
2975 conv.logs[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
2976 ('/%(branches)s/BRANCH_WITH_COMMIT (from /branches/BRANCH:8)', 'A'),
2980 @Cvs2SvnTestFunction
2981 def parent_hints_invalid():
2982 "test --symbol-hints with an invalid parent"
2984 # BRANCH_WITH_COMMIT is usually determined to branch from .trunk.;
2985 # this symbol hints file sets the preferred parent to BRANCH
2986 # instead:
2987 conv = ensure_conversion(
2988 'symbol-mess', symbol_hints_file='symbol-mess-parent-hints-invalid.txt',
2989 error_re=(
2990 r"BLOCKED_BY_BRANCH is not a valid parent for BRANCH_WITH_COMMIT"
2995 @Cvs2SvnTestFunction
2996 def parent_hints_wildcards():
2997 "test --symbol-hints wildcards"
2999 # BRANCH_WITH_COMMIT is usually determined to branch from .trunk.;
3000 # this symbol hints file sets the preferred parent to BRANCH
3001 # instead:
3002 conv = ensure_conversion(
3003 'symbol-mess',
3004 symbol_hints_file='symbol-mess-parent-hints-wildcards.txt',
3006 conv.logs[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
3007 ('/%(branches)s/BRANCH_WITH_COMMIT (from /branches/BRANCH:8)', 'A'),
3011 @Cvs2SvnTestFunction
3012 def path_hints():
3013 "test --symbol-hints for setting svn paths"
3015 conv = ensure_conversion(
3016 'symbol-mess', symbol_hints_file='symbol-mess-path-hints.txt',
3018 conv.logs[1].check('Standard project directories initialized by cvs2svn.', (
3019 ('/trunk', 'A'),
3020 ('/a', 'A'),
3021 ('/a/strange', 'A'),
3022 ('/a/strange/trunk', 'A'),
3023 ('/a/strange/trunk/path', 'A'),
3024 ('/branches', 'A'),
3025 ('/tags', 'A'),
3027 conv.logs[3].check(sym_log_msg('MOSTLY_TAG', 1), (
3028 ('/special', 'A'),
3029 ('/special/tag', 'A'),
3030 ('/special/tag/path (from /a/strange/trunk/path:2)', 'A'),
3032 conv.logs[9].check(sym_log_msg('BRANCH_WITH_COMMIT'), (
3033 ('/special/other', 'A'),
3034 ('/special/other/branch', 'A'),
3035 ('/special/other/branch/path (from /a/strange/trunk/path:2)', 'A'),
3037 conv.logs[10].check(sym_log_msg('MOSTLY_BRANCH'), (
3038 ('/special/branch', 'A'),
3039 ('/special/branch/path (from /a/strange/trunk/path:2)', 'A'),
3043 @Cvs2SvnTestFunction
3044 def issue_99():
3045 "test problem from issue 99"
3047 conv = ensure_conversion('issue-99')
3050 @Cvs2SvnTestFunction
3051 def issue_100():
3052 "test problem from issue 100"
3054 conv = ensure_conversion('issue-100')
3055 file1 = conv.get_wc('trunk', 'file1.txt')
3056 if file(file1).read() != 'file1.txt<1.2>\n':
3057 raise Failure()
3060 @Cvs2SvnTestFunction
3061 def issue_106():
3062 "test problem from issue 106"
3064 conv = ensure_conversion('issue-106')
3067 @Cvs2SvnTestFunction
3068 def options_option():
3069 "use of the --options option"
3071 conv = ensure_conversion('main', options_file='cvs2svn.options')
3074 @Cvs2SvnTestFunction
3075 def multiproject():
3076 "multiproject conversion"
3078 conv = ensure_conversion(
3079 'main', options_file='cvs2svn-multiproject.options'
3081 conv.logs[1].check('Standard project directories initialized by cvs2svn.', (
3082 ('/partial-prune', 'A'),
3083 ('/partial-prune/trunk', 'A'),
3084 ('/partial-prune/branches', 'A'),
3085 ('/partial-prune/tags', 'A'),
3086 ('/partial-prune/releases', 'A'),
3090 @Cvs2SvnTestFunction
3091 def crossproject():
3092 "multiproject conversion with cross-project commits"
3094 conv = ensure_conversion(
3095 'main', options_file='cvs2svn-crossproject.options'
3099 @Cvs2SvnTestFunction
3100 def tag_with_no_revision():
3101 "tag defined but revision is deleted"
3103 conv = ensure_conversion('tag-with-no-revision')
3106 @Cvs2SvnTestFunction
3107 def delete_cvsignore():
3108 "svn:ignore should vanish when .cvsignore does"
3110 # This is issue #81.
3112 conv = ensure_conversion('delete-cvsignore')
3114 wc_tree = conv.get_wc_tree()
3115 props = props_for_path(wc_tree, 'trunk/proj')
3117 if props.has_key('svn:ignore'):
3118 raise Failure()
3121 @Cvs2SvnTestFunction
3122 def repeated_deltatext():
3123 "ignore repeated deltatext blocks with warning"
3125 conv = ensure_conversion('repeated-deltatext')
3126 warning_re = r'.*Deltatext block for revision 1.1 appeared twice'
3127 if not conv.output_found(warning_re):
3128 raise Failure()
3131 @Cvs2SvnTestFunction
3132 def nasty_graphs():
3133 "process some nasty dependency graphs"
3135 # It's not how well the bear can dance, but that the bear can dance
3136 # at all:
3137 conv = ensure_conversion('nasty-graphs')
3140 @Cvs2SvnTestFunction
3141 def tagging_after_delete():
3142 "optimal tag after deleting files"
3144 conv = ensure_conversion('tagging-after-delete')
3146 # tag should be 'clean', no deletes
3147 log = conv.find_tag_log('tag1')
3148 expected = (
3149 ('/%(tags)s/tag1 (from /%(trunk)s:3)', 'A'),
3151 log.check_changes(expected)
3154 @Cvs2SvnTestFunction
3155 def crossed_branches():
3156 "branches created in inconsistent orders"
3158 conv = ensure_conversion('crossed-branches')
3161 @Cvs2SvnTestFunction
3162 def file_directory_conflict():
3163 "error when filename conflicts with directory name"
3165 conv = ensure_conversion(
3166 'file-directory-conflict',
3167 error_re=r'.*Directory name conflicts with filename',
3171 @Cvs2SvnTestFunction
3172 def attic_directory_conflict():
3173 "error when attic filename conflicts with dirname"
3175 # This tests the problem reported in issue #105.
3177 conv = ensure_conversion(
3178 'attic-directory-conflict',
3179 error_re=r'.*Directory name conflicts with filename',
3183 @Cvs2SvnTestFunction
3184 def use_rcs():
3185 "verify that --use-rcs and --use-internal-co agree"
3187 rcs_conv = ensure_conversion(
3188 'main', args=['--use-rcs', '--default-eol=native'],
3190 conv = ensure_conversion(
3191 'main', args=['--default-eol=native'],
3193 if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
3194 raise Failure()
3195 rcs_lines = run_program(
3196 svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
3197 rcs_conv.repos)
3198 lines = run_program(
3199 svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
3200 conv.repos)
3201 # Compare all lines following the repository UUID:
3202 if lines[3:] != rcs_lines[3:]:
3203 raise Failure()
3206 @Cvs2SvnTestFunction
3207 def internal_co_exclude():
3208 "verify that --use-internal-co --exclude=... works"
3210 rcs_conv = ensure_conversion(
3211 'internal-co',
3212 args=['--use-rcs', '--exclude=BRANCH', '--default-eol=native'],
3214 conv = ensure_conversion(
3215 'internal-co',
3216 args=['--exclude=BRANCH', '--default-eol=native'],
3218 if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
3219 raise Failure()
3220 rcs_lines = run_program(
3221 svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
3222 rcs_conv.repos)
3223 lines = run_program(
3224 svntest.main.svnadmin_binary, None, 'dump', '-q', '-r', '1:HEAD',
3225 conv.repos)
3226 # Compare all lines following the repository UUID:
3227 if lines[3:] != rcs_lines[3:]:
3228 raise Failure()
3231 @Cvs2SvnTestFunction
3232 def internal_co_trunk_only():
3233 "verify that --use-internal-co --trunk-only works"
3235 conv = ensure_conversion(
3236 'internal-co',
3237 args=['--trunk-only', '--default-eol=native'],
3239 if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
3240 raise Failure()
3243 @Cvs2SvnTestFunction
3244 def leftover_revs():
3245 "check for leftover checked-out revisions"
3247 conv = ensure_conversion(
3248 'leftover-revs',
3249 args=['--exclude=BRANCH', '--default-eol=native'],
3251 if conv.output_found(r'WARNING\: internal problem\: leftover revisions'):
3252 raise Failure()
3255 @Cvs2SvnTestFunction
3256 def requires_internal_co():
3257 "test that internal co can do more than RCS"
3258 # See issues 4, 11 for the bugs whose regression we're testing for.
3259 # Unlike in requires_cvs above, issue 29 is not covered.
3260 conv = ensure_conversion('requires-cvs')
3262 atsign_contents = file(conv.get_wc("trunk", "atsign-add")).read()
3264 if atsign_contents[-1:] == "@":
3265 raise Failure()
3267 if not (conv.logs[6].author == "William Lyon Phelps III" and
3268 conv.logs[5].author == "j random"):
3269 raise Failure()
3272 @Cvs2SvnTestFunction
3273 def internal_co_keywords():
3274 "test that internal co handles keywords correctly"
3275 conv_ic = ensure_conversion('internal-co-keywords',
3276 args=["--keywords-off"])
3277 conv_cvs = ensure_conversion('internal-co-keywords',
3278 args=["--use-cvs", "--keywords-off"])
3280 ko_ic = file(conv_ic.get_wc('trunk', 'dir', 'ko.txt')).read()
3281 ko_cvs = file(conv_cvs.get_wc('trunk', 'dir', 'ko.txt')).read()
3282 kk_ic = file(conv_ic.get_wc('trunk', 'dir', 'kk.txt')).read()
3283 kk_cvs = file(conv_cvs.get_wc('trunk', 'dir', 'kk.txt')).read()
3284 kv_ic = file(conv_ic.get_wc('trunk', 'dir', 'kv.txt')).read()
3285 kv_cvs = file(conv_cvs.get_wc('trunk', 'dir', 'kv.txt')).read()
3287 if ko_ic != ko_cvs:
3288 raise Failure()
3289 if kk_ic != kk_cvs:
3290 raise Failure()
3292 # The date format changed between cvs and co ('/' instead of '-').
3293 # Accept either one:
3294 date_substitution_re = re.compile(r' ([0-9]*)-([0-9]*)-([0-9]*) ')
3295 if kv_ic != kv_cvs \
3296 and date_substitution_re.sub(r' \1/\2/\3 ', kv_ic) != kv_cvs:
3297 raise Failure()
3300 @Cvs2SvnTestFunction
3301 def timestamp_chaos():
3302 "test timestamp adjustments"
3304 conv = ensure_conversion('timestamp-chaos', args=["-v"])
3306 # The times are expressed here in UTC:
3307 times = [
3308 '2007-01-01 21:00:00', # Initial commit
3309 '2007-01-01 21:00:00', # revision 1.1 of both files
3310 '2007-01-01 21:00:01', # revision 1.2 of file1.txt, adjusted forwards
3311 '2007-01-01 21:00:02', # revision 1.2 of file2.txt, adjusted backwards
3312 '2007-01-01 22:00:00', # revision 1.3 of both files
3315 # Convert the times to seconds since the epoch, in UTC:
3316 times = [calendar.timegm(svn_strptime(t)) for t in times]
3318 for i in range(len(times)):
3319 if abs(conv.logs[i + 1].date - times[i]) > 0.1:
3320 raise Failure()
3323 @Cvs2SvnTestFunction
3324 def symlinks():
3325 "convert a repository that contains symlinks"
3327 # This is a test for issue #97.
3329 proj = os.path.join(test_data_dir, 'symlinks-cvsrepos', 'proj')
3330 links = [
3332 os.path.join('..', 'file.txt,v'),
3333 os.path.join(proj, 'dir1', 'file.txt,v'),
3336 'dir1',
3337 os.path.join(proj, 'dir2'),
3341 try:
3342 os.symlink
3343 except AttributeError:
3344 # Apparently this OS doesn't support symlinks, so skip test.
3345 raise svntest.Skip()
3347 try:
3348 for (src,dst) in links:
3349 os.symlink(src, dst)
3351 conv = ensure_conversion('symlinks')
3352 conv.logs[2].check('', (
3353 ('/%(trunk)s/proj', 'A'),
3354 ('/%(trunk)s/proj/file.txt', 'A'),
3355 ('/%(trunk)s/proj/dir1', 'A'),
3356 ('/%(trunk)s/proj/dir1/file.txt', 'A'),
3357 ('/%(trunk)s/proj/dir2', 'A'),
3358 ('/%(trunk)s/proj/dir2/file.txt', 'A'),
3360 finally:
3361 for (src,dst) in links:
3362 os.remove(dst)
3365 @Cvs2SvnTestFunction
3366 def empty_trunk_path():
3367 "allow --trunk to be empty if --trunk-only"
3369 # This is a test for issue #53.
3371 conv = ensure_conversion(
3372 'main', args=['--trunk-only', '--trunk='],
3376 @Cvs2SvnTestFunction
3377 def preferred_parent_cycle():
3378 "handle a cycle in branch parent preferences"
3380 conv = ensure_conversion('preferred-parent-cycle')
3383 @Cvs2SvnTestFunction
3384 def branch_from_empty_dir():
3385 "branch from an empty directory"
3387 conv = ensure_conversion('branch-from-empty-dir')
3390 @Cvs2SvnTestFunction
3391 def trunk_readd():
3392 "add a file on a branch then on trunk"
3394 conv = ensure_conversion('trunk-readd')
3397 @Cvs2SvnTestFunction
3398 def branch_from_deleted_1_1():
3399 "branch from a 1.1 revision that will be deleted"
3401 conv = ensure_conversion('branch-from-deleted-1-1')
3402 conv.logs[5].check('Adding b.txt:1.1.2.1', (
3403 ('/%(branches)s/BRANCH1/proj/b.txt', 'A'),
3405 conv.logs[6].check('Adding b.txt:1.1.4.1', (
3406 ('/%(branches)s/BRANCH2/proj/b.txt', 'A'),
3408 conv.logs[7].check('Adding b.txt:1.2', (
3409 ('/%(trunk)s/proj/b.txt', 'A'),
3412 conv.logs[8].check('Adding c.txt:1.1.2.1', (
3413 ('/%(branches)s/BRANCH1/proj/c.txt', 'A'),
3415 conv.logs[9].check('Adding c.txt:1.1.4.1', (
3416 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3420 @Cvs2SvnTestFunction
3421 def add_on_branch():
3422 "add a file on a branch using newer CVS"
3424 conv = ensure_conversion('add-on-branch')
3425 conv.logs[6].check('Adding b.txt:1.1', (
3426 ('/%(trunk)s/proj/b.txt', 'A'),
3428 conv.logs[7].check('Adding b.txt:1.1.2.2', (
3429 ('/%(branches)s/BRANCH1/proj/b.txt', 'A'),
3431 conv.logs[8].check('Adding c.txt:1.1', (
3432 ('/%(trunk)s/proj/c.txt', 'A'),
3434 conv.logs[9].check('Removing c.txt:1.2', (
3435 ('/%(trunk)s/proj/c.txt', 'D'),
3437 conv.logs[10].check('Adding c.txt:1.2.2.2', (
3438 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3440 conv.logs[11].check('Adding d.txt:1.1', (
3441 ('/%(trunk)s/proj/d.txt', 'A'),
3443 conv.logs[12].check('Adding d.txt:1.1.2.2', (
3444 ('/%(branches)s/BRANCH3/proj/d.txt', 'A'),
3448 @Cvs2SvnTestFunction
3449 def main_git():
3450 "test output in git-fast-import format"
3452 # Note: To test importing into git, do
3454 # ./run-tests <test-number>
3455 # rm -rf .git
3456 # git-init
3457 # cat cvs2svn-tmp/{blobfile,dumpfile}.out | git fast-import
3459 # Or, to load the dumpfiles separately:
3461 # cat cvs2svn-tmp/git-blob.dat \
3462 # | git fast-import --export-marks=cvs2svn-tmp/git-marks.dat
3463 # cat cvs2svn-tmp/git-dump.dat \
3464 # | git fast-import --import-marks=cvs2svn-tmp/git-marks.dat
3466 # Then use "gitk --all", "git log", etc. to test the contents of the
3467 # repository.
3469 # We don't have the infrastructure to check that the resulting git
3470 # repository is correct, so we just check that the conversion runs
3471 # to completion:
3472 conv = GitConversion('main', None, [
3473 '--blobfile=cvs2svn-tmp/blobfile.out',
3474 '--dumpfile=cvs2svn-tmp/dumpfile.out',
3475 '--username=cvs2git',
3476 'test-data/main-cvsrepos',
3480 @Cvs2SvnTestFunction
3481 def main_git2():
3482 "test cvs2git --use-external-blob-generator option"
3484 # See comment in main_git() for more information.
3486 conv = GitConversion('main', None, [
3487 '--use-external-blob-generator',
3488 '--blobfile=cvs2svn-tmp/blobfile.out',
3489 '--dumpfile=cvs2svn-tmp/dumpfile.out',
3490 '--username=cvs2git',
3491 'test-data/main-cvsrepos',
3495 @Cvs2SvnTestFunction
3496 def git_options():
3497 "test cvs2git using options file"
3499 conv = GitConversion('main', None, [], options_file='cvs2git.options')
3502 @Cvs2SvnTestFunction
3503 def main_hg():
3504 "output in git-fast-import format with inline data"
3506 # The output should be suitable for import by Mercurial.
3508 # We don't have the infrastructure to check that the resulting
3509 # Mercurial repository is correct, so we just check that the
3510 # conversion runs to completion:
3511 conv = GitConversion('main', None, [], options_file='cvs2hg.options')
3514 @Cvs2SvnTestFunction
3515 def invalid_symbol():
3516 "a symbol with the incorrect format"
3518 conv = ensure_conversion('invalid-symbol')
3519 if not conv.output_found(
3520 r".*branch 'SYMBOL' references invalid revision 1$"
3522 raise Failure()
3525 @Cvs2SvnTestFunction
3526 def invalid_symbol_ignore():
3527 "ignore a symbol using a SymbolMapper"
3529 conv = ensure_conversion(
3530 'invalid-symbol', options_file='cvs2svn-ignore.options'
3534 @Cvs2SvnTestFunction
3535 def invalid_symbol_ignore2():
3536 "ignore a symbol using an IgnoreSymbolTransform"
3538 conv = ensure_conversion(
3539 'invalid-symbol', options_file='cvs2svn-ignore2.options'
3543 class EOLVariants(Cvs2SvnTestCase):
3544 "handle various --eol-style options"
3546 eol_style_strings = {
3547 'LF' : '\n',
3548 'CR' : '\r',
3549 'CRLF' : '\r\n',
3550 'native' : '\n',
3553 def __init__(self, eol_style):
3554 self.eol_style = eol_style
3555 self.dumpfile = 'eol-variants-%s.dump' % (self.eol_style,)
3556 Cvs2SvnTestCase.__init__(
3557 self, 'eol-variants', variant=self.eol_style,
3558 dumpfile=self.dumpfile,
3559 args=[
3560 '--default-eol=%s' % (self.eol_style,),
3564 def run(self, sbox):
3565 conv = self.ensure_conversion()
3566 dump_contents = open(conv.dumpfile, 'rb').read()
3567 expected_text = self.eol_style_strings[self.eol_style].join(
3568 ['line 1', 'line 2', '\n\n']
3570 if not dump_contents.endswith(expected_text):
3571 raise Failure()
3574 @Cvs2SvnTestFunction
3575 def no_revs_file():
3576 "handle a file with no revisions (issue #80)"
3578 conv = ensure_conversion('no-revs-file')
3581 @Cvs2SvnTestFunction
3582 def mirror_keyerror_test():
3583 "a case that gave KeyError in SVNRepositoryMirror"
3585 conv = ensure_conversion('mirror-keyerror')
3588 @Cvs2SvnTestFunction
3589 def exclude_ntdb_test():
3590 "exclude a non-trunk default branch"
3592 symbol_info_file = os.path.join(tmp_dir, 'exclude-ntdb-symbol-info.txt')
3593 conv = ensure_conversion(
3594 'exclude-ntdb',
3595 args=[
3596 '--write-symbol-info=%s' % (symbol_info_file,),
3597 '--exclude=branch3',
3598 '--exclude=tag3',
3599 '--exclude=vendortag3',
3600 '--exclude=vendorbranch',
3605 @Cvs2SvnTestFunction
3606 def mirror_keyerror2_test():
3607 "a case that gave KeyError in RepositoryMirror"
3609 conv = ensure_conversion('mirror-keyerror2')
3612 @Cvs2SvnTestFunction
3613 def mirror_keyerror3_test():
3614 "a case that gave KeyError in RepositoryMirror"
3616 conv = ensure_conversion('mirror-keyerror3')
3619 @Cvs2SvnTestFunction
3620 def add_cvsignore_to_branch_test():
3621 "check adding .cvsignore to an existing branch"
3623 # This a test for issue #122.
3625 conv = ensure_conversion('add-cvsignore-to-branch')
3626 wc_tree = conv.get_wc_tree()
3627 trunk_props = props_for_path(wc_tree, 'trunk/dir')
3628 if trunk_props['svn:ignore'] != '*.o\n\n':
3629 raise Failure()
3631 branch_props = props_for_path(wc_tree, 'branches/BRANCH/dir')
3632 if branch_props['svn:ignore'] != '*.o\n\n':
3633 raise Failure()
3636 @Cvs2SvnTestFunction
3637 def missing_deltatext():
3638 "a revision's deltatext is missing"
3640 # This is a type of RCS file corruption that has been observed.
3641 conv = ensure_conversion(
3642 'missing-deltatext',
3643 error_re=(
3644 r"ERROR\: .* has no deltatext section for revision 1\.1\.4\.4"
3649 @Cvs2SvnTestFunction
3650 def transform_unlabeled_branch_name():
3651 "transform name of unlabeled branch"
3653 conv = ensure_conversion(
3654 'unlabeled-branch',
3655 args=[
3656 '--symbol-transform=unlabeled-1.1.4:BRANCH2',
3659 if conv.path_exists('branches', 'unlabeled-1.1.4'):
3660 raise Failure('Branch unlabeled-1.1.4 not excluded')
3661 if not conv.path_exists('branches', 'BRANCH2'):
3662 raise Failure('Branch BRANCH2 not found')
3665 @Cvs2SvnTestFunction
3666 def ignore_unlabeled_branch():
3667 "ignoring an unlabeled branch is not allowed"
3669 conv = ensure_conversion(
3670 'unlabeled-branch',
3671 options_file='cvs2svn-ignore.options',
3672 error_re=(
3673 r"ERROR\: The unlabeled branch \'unlabeled\-1\.1\.4\' "
3674 r"in \'.*\' contains commits"
3679 @Cvs2SvnTestFunction
3680 def exclude_unlabeled_branch():
3681 "exclude unlabeled branch"
3683 conv = ensure_conversion(
3684 'unlabeled-branch',
3685 args=['--exclude=unlabeled-.*'],
3687 if conv.path_exists('branches', 'unlabeled-1.1.4'):
3688 raise Failure('Branch unlabeled-1.1.4 not excluded')
3691 @Cvs2SvnTestFunction
3692 def unlabeled_branch_name_collision():
3693 "transform unlabeled branch to same name as branch"
3695 conv = ensure_conversion(
3696 'unlabeled-branch',
3697 args=[
3698 '--symbol-transform=unlabeled-1.1.4:BRANCH',
3700 error_re=(
3701 r"ERROR\: Symbol name \'BRANCH\' is already used"
3706 @Cvs2SvnTestFunction
3707 def collision_with_unlabeled_branch_name():
3708 "transform branch to same name as unlabeled branch"
3710 conv = ensure_conversion(
3711 'unlabeled-branch',
3712 args=[
3713 '--symbol-transform=BRANCH:unlabeled-1.1.4',
3715 error_re=(
3716 r"ERROR\: Symbol name \'unlabeled\-1\.1\.4\' is already used"
3721 @Cvs2SvnTestFunction
3722 def many_deletes():
3723 "a repo with many removable dead revisions"
3725 conv = ensure_conversion('many-deletes')
3726 conv.logs[5].check('Add files on BRANCH', (
3727 ('/%(branches)s/BRANCH/proj/b.txt', 'A'),
3729 conv.logs[6].check('Add files on BRANCH2', (
3730 ('/%(branches)s/BRANCH2/proj/b.txt', 'A'),
3731 ('/%(branches)s/BRANCH2/proj/c.txt', 'A'),
3732 ('/%(branches)s/BRANCH2/proj/d.txt', 'A'),
3736 cvs_description = Cvs2SvnPropertiesTestCase(
3737 'main',
3738 doc='test handling of CVS file descriptions',
3739 props_to_test=['cvs:description'],
3740 expected_props=[
3741 ('trunk/proj/default', ['This is an example file description.']),
3742 ('trunk/proj/sub1/default', [None]),
3746 @Cvs2SvnTestFunction
3747 def include_empty_directories():
3748 "test --include-empty-directories option"
3750 conv = ensure_conversion(
3751 'empty-directories', args=['--include-empty-directories'],
3753 conv.logs[1].check('Standard project directories', (
3754 ('/%(trunk)s', 'A'),
3755 ('/%(branches)s', 'A'),
3756 ('/%(tags)s', 'A'),
3757 ('/%(trunk)s/root-empty-directory', 'A'),
3758 ('/%(trunk)s/root-empty-directory/empty-subdirectory', 'A'),
3760 conv.logs[3].check('Add b.txt.', (
3761 ('/%(trunk)s/direct', 'A'),
3762 ('/%(trunk)s/direct/b.txt', 'A'),
3763 ('/%(trunk)s/direct/empty-directory', 'A'),
3764 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3766 conv.logs[4].check('Add c.txt.', (
3767 ('/%(trunk)s/indirect', 'A'),
3768 ('/%(trunk)s/indirect/subdirectory', 'A'),
3769 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3770 ('/%(trunk)s/indirect/empty-directory', 'A'),
3771 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3773 conv.logs[5].check('Remove b.txt', (
3774 ('/%(trunk)s/direct', 'D'),
3776 conv.logs[6].check('Remove c.txt', (
3777 ('/%(trunk)s/indirect', 'D'),
3779 conv.logs[7].check('Re-add b.txt.', (
3780 ('/%(trunk)s/direct', 'A'),
3781 ('/%(trunk)s/direct/b.txt', 'A'),
3782 ('/%(trunk)s/direct/empty-directory', 'A'),
3783 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3785 conv.logs[8].check('Re-add c.txt.', (
3786 ('/%(trunk)s/indirect', 'A'),
3787 ('/%(trunk)s/indirect/subdirectory', 'A'),
3788 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3789 ('/%(trunk)s/indirect/empty-directory', 'A'),
3790 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3792 conv.logs[9].check('This commit was manufactured', (
3793 ('/%(tags)s/TAG (from /%(trunk)s:8)', 'A'),
3795 conv.logs[10].check('This commit was manufactured', (
3796 ('/%(branches)s/BRANCH (from /%(trunk)s:8)', 'A'),
3798 conv.logs[11].check('Import d.txt.', (
3799 ('/%(branches)s/VENDORBRANCH', 'A'),
3800 ('/%(branches)s/VENDORBRANCH/import', 'A'),
3801 ('/%(branches)s/VENDORBRANCH/import/d.txt', 'A'),
3802 ('/%(branches)s/VENDORBRANCH/root-empty-directory', 'A'),
3803 ('/%(branches)s/VENDORBRANCH/root-empty-directory/empty-subdirectory',
3804 'A'),
3805 ('/%(branches)s/VENDORBRANCH/import/empty-directory', 'A'),
3806 ('/%(branches)s/VENDORBRANCH/import/empty-directory/empty-subdirectory',
3807 'A'),
3809 conv.logs[12].check('This commit was generated', (
3810 ('/%(trunk)s/import', 'A'),
3811 ('/%(trunk)s/import/d.txt '
3812 '(from /%(branches)s/VENDORBRANCH/import/d.txt:11)', 'A'),
3813 ('/%(trunk)s/import/empty-directory', 'A'),
3814 ('/%(trunk)s/import/empty-directory/empty-subdirectory', 'A'),
3818 @Cvs2SvnTestFunction
3819 def include_empty_directories_no_prune():
3820 "test --include-empty-directories with --no-prune"
3822 conv = ensure_conversion(
3823 'empty-directories', args=['--include-empty-directories', '--no-prune'],
3825 conv.logs[1].check('Standard project directories', (
3826 ('/%(trunk)s', 'A'),
3827 ('/%(branches)s', 'A'),
3828 ('/%(tags)s', 'A'),
3829 ('/%(trunk)s/root-empty-directory', 'A'),
3830 ('/%(trunk)s/root-empty-directory/empty-subdirectory', 'A'),
3832 conv.logs[3].check('Add b.txt.', (
3833 ('/%(trunk)s/direct', 'A'),
3834 ('/%(trunk)s/direct/b.txt', 'A'),
3835 ('/%(trunk)s/direct/empty-directory', 'A'),
3836 ('/%(trunk)s/direct/empty-directory/empty-subdirectory', 'A'),
3838 conv.logs[4].check('Add c.txt.', (
3839 ('/%(trunk)s/indirect', 'A'),
3840 ('/%(trunk)s/indirect/subdirectory', 'A'),
3841 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3842 ('/%(trunk)s/indirect/empty-directory', 'A'),
3843 ('/%(trunk)s/indirect/empty-directory/empty-subdirectory', 'A'),
3845 conv.logs[5].check('Remove b.txt', (
3846 ('/%(trunk)s/direct/b.txt', 'D'),
3848 conv.logs[6].check('Remove c.txt', (
3849 ('/%(trunk)s/indirect/subdirectory/c.txt', 'D'),
3851 conv.logs[7].check('Re-add b.txt.', (
3852 ('/%(trunk)s/direct/b.txt', 'A'),
3854 conv.logs[8].check('Re-add c.txt.', (
3855 ('/%(trunk)s/indirect/subdirectory/c.txt', 'A'),
3857 conv.logs[9].check('This commit was manufactured', (
3858 ('/%(tags)s/TAG (from /%(trunk)s:8)', 'A'),
3860 conv.logs[10].check('This commit was manufactured', (
3861 ('/%(branches)s/BRANCH (from /%(trunk)s:8)', 'A'),
3865 @Cvs2SvnTestFunction
3866 def exclude_symbol_default():
3867 "test 'exclude' symbol default"
3869 conv = ensure_conversion(
3870 'symbol-mess', args=['--symbol-default=exclude'])
3871 if conv.path_exists('tags', 'MOSTLY_BRANCH') \
3872 or conv.path_exists('branches', 'MOSTLY_BRANCH'):
3873 raise Failure()
3874 if conv.path_exists('tags', 'MOSTLY_TAG') \
3875 or conv.path_exists('branches', 'MOSTLY_TAG'):
3876 raise Failure()
3879 @Cvs2SvnTestFunction
3880 def add_on_branch2():
3881 "another add-on-branch test case"
3883 conv = ensure_conversion('add-on-branch2')
3884 if len(conv.logs) != 2:
3885 raise Failure()
3886 conv.logs[2].check('add file on branch', (
3887 ('/%(branches)s/BRANCH', 'A'),
3888 ('/%(branches)s/BRANCH/file1', 'A'),
3892 @Cvs2SvnTestFunction
3893 def branch_from_vendor_branch():
3894 "branch from vendor branch"
3896 ensure_conversion(
3897 'branch-from-vendor-branch',
3898 symbol_hints_file='branch-from-vendor-branch-symbol-hints.txt',
3902 @Cvs2SvnTestFunction
3903 def strange_default_branch():
3904 "default branch too deep in the hierarchy"
3906 ensure_conversion(
3907 'strange-default-branch',
3908 error_re=(
3909 r'ERROR\: The default branch 1\.2\.4\.3\.2\.1\.2 '
3910 r'in file .* is not a top-level branch'
3915 @Cvs2SvnTestFunction
3916 def move_parent():
3917 "graft onto preferred parent that was itself moved"
3919 conv = ensure_conversion(
3920 'move-parent',
3922 conv.logs[2].check('first', (
3923 ('/%(trunk)s/file1', 'A'),
3924 ('/%(trunk)s/file2', 'A'),
3926 conv.logs[3].check('This commit was manufactured', (
3927 ('/%(branches)s/b2 (from /%(trunk)s:2)', 'A'),
3929 conv.logs[4].check('second', (
3930 ('/%(branches)s/b2/file1', 'M'),
3932 conv.logs[5].check('This commit was manufactured', (
3933 ('/%(branches)s/b1 (from /%(branches)s/b2:4)', 'A'),
3936 # b2 and b1 are equally good parents for b3, so accept either one.
3937 # (Currently, cvs2svn chooses b1 as the preferred parent because it
3938 # comes earlier than b2 in alphabetical order.)
3939 try:
3940 conv.logs[6].check('This commit was manufactured', (
3941 ('/%(branches)s/b3 (from /%(branches)s/b1:5)', 'A'),
3943 except Failure:
3944 conv.logs[6].check('This commit was manufactured', (
3945 ('/%(branches)s/b3 (from /%(branches)s/b2:4)', 'A'),
3949 @Cvs2SvnTestFunction
3950 def log_message_eols():
3951 "nonstandard EOLs in log messages"
3953 conv = ensure_conversion(
3954 'log-message-eols',
3956 conv.logs[2].check('The CRLF at the end of this line\nshould', (