diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
| commit | cf46733632c7279a9fd0fe6ce26f9185a4ae82a9 (patch) | |
| tree | da27775a2161723ef342e91af41a8b51fedef405 /subversion/tests/cmdline/svnadmin_tests.py | |
| parent | bb0ef45f7c46b0ae221b26265ef98a768c33f820 (diff) | |
| download | subversion-tarball-master.tar.gz | |
subversion-1.9.7HEADsubversion-1.9.7master
Diffstat (limited to 'subversion/tests/cmdline/svnadmin_tests.py')
| -rwxr-xr-x | subversion/tests/cmdline/svnadmin_tests.py | 1582 |
1 files changed, 1415 insertions, 167 deletions
diff --git a/subversion/tests/cmdline/svnadmin_tests.py b/subversion/tests/cmdline/svnadmin_tests.py index e32681d..470db65 100755 --- a/subversion/tests/cmdline/svnadmin_tests.py +++ b/subversion/tests/cmdline/svnadmin_tests.py @@ -26,11 +26,13 @@ # General modules import os +import logging import re import shutil import sys import threading -import logging +import time +import gzip logger = logging.getLogger() @@ -48,6 +50,7 @@ XFail = svntest.testcase.XFail_deco Issues = svntest.testcase.Issues_deco Issue = svntest.testcase.Issue_deco Wimp = svntest.testcase.Wimp_deco +SkipDumpLoadCrossCheck = svntest.testcase.SkipDumpLoadCrossCheck_deco Item = svntest.wc.StateItem def check_hotcopy_bdb(src, dst): @@ -61,8 +64,7 @@ def check_hotcopy_bdb(src, dst): if origerr or backerr or origout != backout: raise svntest.Failure -def check_hotcopy_fsfs(src, dst): - "Verify that the SRC FSFS repository has been correctly copied to DST." +def check_hotcopy_fsfs_fsx(src, dst): # Walk the source and compare all files to the destination for src_dirpath, src_dirs, src_files in os.walk(src): # Verify that the current directory exists in the destination @@ -72,16 +74,34 @@ def check_hotcopy_fsfs(src, dst): "destination" % dst_dirpath) # Verify that all dirents in the current directory also exist in source for dst_dirent in os.listdir(dst_dirpath): + # Ignore auto-created empty lock files as they may or may not + # be present and are neither required by nor do they harm to + # the destination repository. + if dst_dirent == 'pack-lock': + continue + if dst_dirent == 'write-lock': + continue + + # Ignore auto-created rep-cache.db-journal file + if dst_dirent == 'rep-cache.db-journal': + continue + src_dirent = os.path.join(src_dirpath, dst_dirent) if not os.path.exists(src_dirent): raise svntest.Failure("%s does not exist in hotcopy " "source" % src_dirent) # Compare all files in this directory for src_file in src_files: - # Exclude temporary files - if src_file == 'rev-prop-atomics.shm': + # Ignore auto-created empty lock files as they may or may not + # be present and are neither required by nor do they harm to + # the destination repository. + if src_file == 'pack-lock': continue - if src_file == 'rev-prop-atomics.mutex': + if src_file == 'write-lock': + continue + + # Ignore auto-created rep-cache.db-journal file + if src_file == 'rep-cache.db-journal': continue src_path = os.path.join(src_dirpath, src_file) @@ -90,6 +110,20 @@ def check_hotcopy_fsfs(src, dst): raise svntest.Failure("%s does not exist in hotcopy " "destination" % dst_path) + # Special case for db/uuid: Only the UUID in the first line needs + # to match. Source and target must have the same number of lines + # (due to having the same format). + if src_path == os.path.join(src, 'db', 'uuid'): + lines1 = open(src_path, 'rb').read().split("\n") + lines2 = open(dst_path, 'rb').read().split("\n") + if len(lines1) != len(lines2): + raise svntest.Failure("%s differs in number of lines" + % dst_path) + if lines1[0] != lines2[0]: + raise svntest.Failure("%s contains different uuid: '%s' vs. '%s'" + % (dst_path, lines1[0], lines2[0])) + continue + # Special case for rep-cache: It will always differ in a byte-by-byte # comparison, so compare db tables instead. if src_file == 'rep-cache.db': @@ -106,14 +140,14 @@ def check_hotcopy_fsfs(src, dst): for i in range(len(rows1)): if rows1[i] != rows2[i]: raise svntest.Failure("rep-cache row %i differs: '%s' vs. '%s'" - % (row, rows1[i])) + % (i, rows1[i], rows2[i])) continue # Special case for revprop-generation: It will always be zero in # the hotcopy destination (i.e. a fresh cache generation) if src_file == 'revprop-generation': f2 = open(dst_path, 'r') - revprop_gen = int(f2.read().strip()) + revprop_gen = int(f2.read().strip().split()[1]) if revprop_gen != 0: raise svntest.Failure("Hotcopy destination has non-zero " + "revprop generation") @@ -146,6 +180,14 @@ def check_hotcopy_fsfs(src, dst): f1.close() f2.close() +def check_hotcopy_fsfs(src, dst): + "Verify that the SRC FSFS repository has been correctly copied to DST." + check_hotcopy_fsfs_fsx(src, dst) + +def check_hotcopy_fsx(src, dst): + "Verify that the SRC FSX repository has been correctly copied to DST." + check_hotcopy_fsfs_fsx(src, dst) + #---------------------------------------------------------------------- # How we currently test 'svnadmin' -- @@ -189,6 +231,24 @@ def get_txns(repo_dir): return txns +def patch_format(repo_dir, shard_size): + """Rewrite the format of the FSFS or FSX repository REPO_DIR so + that it would use sharding with SHARDS revisions per shard.""" + + format_path = os.path.join(repo_dir, "db", "format") + contents = open(format_path, 'rb').read() + processed_lines = [] + + for line in contents.split("\n"): + if line.startswith("layout "): + processed_lines.append("layout sharded %d" % shard_size) + else: + processed_lines.append(line) + + new_contents = "\n".join(processed_lines) + os.chmod(format_path, 0666) + open(format_path, 'wb').write(new_contents) + def load_and_verify_dumpstream(sbox, expected_stdout, expected_stderr, revs, check_props, dump, *varargs): """Load the array of lines passed in DUMP into the current tests' @@ -225,8 +285,7 @@ def load_and_verify_dumpstream(sbox, expected_stdout, expected_stderr, if revs: # verify revs as wc states for rev in range(len(revs)): - svntest.actions.run_and_verify_svn("Updating to r%s" % (rev+1), - svntest.verify.AnyOutput, [], + svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], "update", "-r%s" % (rev+1), sbox.wc_dir) @@ -238,42 +297,140 @@ def load_dumpstream(sbox, dump, *varargs): return load_and_verify_dumpstream(sbox, None, None, None, False, dump, *varargs) -###################################################################### -# Tests - +class FSFS_Index: + """Manages indexes of a rev file in a FSFS format 7 repository. + The interface returns P2L information and allows for item offsets + and lengths to be modified. """ + + def __init__(self, sbox, revision): + self.by_item = { } + self.revision = revision + self.repo_dir = sbox.repo_dir + + self._read() + + def _read(self): + """ Read P2L index using svnfsfs. """ + exit_code, output, errput = svntest.main.run_svnfsfs('dump-index', + '-r' + str(self.revision), + self.repo_dir) + svntest.verify.verify_outputs("Error while dumping index", + [], errput, [], []) + svntest.verify.verify_exit_code(None, exit_code, 0) + + self.by_item.clear() + for line in output: + values = line.split() + if len(values) >= 4 and values[0] != 'Start': + item = long(values[4]) + self.by_item[item] = values + + def _write(self): + """ Rewrite indexes using svnfsfs. """ + by_offset = {} + for values in self.by_item.itervalues(): + by_offset[long(values[0], 16)] = values + + lines = [] + for (offset, values) in sorted(by_offset.items()): + values = by_offset[offset] + line = values[0] + ' ' + values[1] + ' ' + values[2] + ' ' + \ + values[3] + ' ' + values[4] + '\n'; + lines.append(line) + + exit_code, output, errput = svntest.main.run_command_stdin( + svntest.main.svnfsfs_binary, 0, 0, True, lines, + 'load-index', self.repo_dir) + + svntest.verify.verify_outputs("Error while rewriting index", + output, errput, [], []) + svntest.verify.verify_exit_code(None, exit_code, 0) + + def get_item(self, item): + """ Return offset, length and type of ITEM. """ + values = self.by_item[item] + + offset = long(values[0], 16) + len = long(values[1], 16) + type = values[2] + + return (offset, len, type) + + def modify_item(self, item, offset, len): + """ Modify offset and length of ITEM. """ + values = self.by_item[item] + + values[0] = '%x' % offset + values[1] = '%x' % len + + self._write() + +def repo_format(sbox): + """ Return the repository format number for SBOX.""" + + format_file = open(os.path.join(sbox.repo_dir, "db", "format")) + format = int(format_file.read()[:1]) + format_file.close() -#---------------------------------------------------------------------- + return format -def test_create(sbox): - "'svnadmin create'" +def set_changed_path_list(sbox, revision, changes): + """ Replace the changed paths list in the revision file REVISION in SBOX + with the text CHANGES.""" + idx = None - repo_dir = sbox.repo_dir - wc_dir = sbox.wc_dir + # read full file + fp = open(fsfs_file(sbox.repo_dir, 'revs', str(revision)), 'r+b') + contents = fp.read() + length = len(contents) - svntest.main.safe_rmtree(repo_dir, 1) - svntest.main.safe_rmtree(wc_dir) - - svntest.main.create_repos(repo_dir) - - svntest.actions.run_and_verify_svn("Creating rev 0 checkout", - ["Checked out revision 0.\n"], [], - "checkout", - sbox.repo_url, wc_dir) + if repo_format(sbox) < 7: + # replace the changed paths list + header = contents[contents.rfind('\n', length - 64, length - 1):] + body_len = long(header.split(' ')[1]) + else: + # read & parse revision file footer + footer_length = ord(contents[length-1]); + footer = contents[length - footer_length - 1:length-1] + l2p_offset = long(footer.split(' ')[0]) + l2p_checksum = footer.split(' ')[1] + p2l_offset = long(footer.split(' ')[2]) + p2l_checksum = footer.split(' ')[3] + + idx = FSFS_Index(sbox, revision) + (offset, item_len, item_type) = idx.get_item(1) + + # split file contents + body_len = offset + indexes = contents[l2p_offset:length - footer_length - 1] + + # construct new footer, include indexes as are + file_len = body_len + len(changes) + 1 + p2l_offset += file_len - l2p_offset + + header = str(file_len) + ' ' + l2p_checksum + ' ' \ + + str(p2l_offset) + ' ' + p2l_checksum + header += chr(len(header)) + header = '\n' + indexes + header + + contents = contents[:body_len] + changes + header + + # set new contents + fp.seek(0) + fp.write(contents) + fp.truncate() + fp.close() - svntest.actions.run_and_verify_svn( - "Running status", - [], [], - "status", wc_dir) + if repo_format(sbox) >= 7: + idx.modify_item(1, offset, len(changes) + 1) - svntest.actions.run_and_verify_svn( - "Running verbose status", - [" 0 0 ? %s\n" % wc_dir], [], - "status", "--verbose", wc_dir) +###################################################################### +# Tests - # success +#---------------------------------------------------------------------- # dump stream tests need a dump file @@ -306,7 +463,7 @@ dumpfile_revisions = \ def extra_headers(sbox): "loading of dumpstream with extra headers" - test_create(sbox) + sbox.build(empty=True) dumpfile = clean_dumpfile() @@ -321,7 +478,7 @@ def extra_headers(sbox): def extra_blockcontent(sbox): "load success on oversized Content-length" - test_create(sbox) + sbox.build(empty=True) dumpfile = clean_dumpfile() @@ -339,7 +496,7 @@ def extra_blockcontent(sbox): def inconsistent_headers(sbox): "load failure on undersized Content-length" - test_create(sbox) + sbox.build(empty=True) dumpfile = clean_dumpfile() @@ -355,7 +512,7 @@ def inconsistent_headers(sbox): def empty_date(sbox): "preserve date-less revisions in load" - test_create(sbox) + sbox.build(empty=True) dumpfile = clean_dumpfile() @@ -370,8 +527,8 @@ def empty_date(sbox): '--ignore-uuid') # Verify that the revision still lacks the svn:date property. - svntest.actions.run_and_verify_svn(None, [], [], "propget", - "--revprop", "-r1", "svn:date", + svntest.actions.run_and_verify_svn([], '.*(E195011|E200017).*svn:date', + "propget", "--revprop", "-r1", "svn:date", sbox.wc_dir) #---------------------------------------------------------------------- @@ -386,8 +543,7 @@ def dump_copied_dir(sbox): old_C_path = os.path.join(wc_dir, 'A', 'C') new_C_path = os.path.join(wc_dir, 'A', 'B', 'C') svntest.main.run_svn(None, 'cp', old_C_path, new_C_path) - svntest.main.run_svn(None, 'ci', wc_dir, '--quiet', - '-m', 'log msg') + sbox.simple_commit(message='log msg') exit_code, output, errput = svntest.main.run_svnadmin("dump", repo_dir) if svntest.verify.compare_and_display_lines( @@ -410,8 +566,7 @@ def dump_move_dir_modify_child(sbox): Q_path = os.path.join(wc_dir, 'A', 'Q') svntest.main.run_svn(None, 'cp', B_path, Q_path) svntest.main.file_append(os.path.join(Q_path, 'lambda'), 'hello') - svntest.main.run_svn(None, 'ci', wc_dir, '--quiet', - '-m', 'log msg') + sbox.simple_commit(message='log msg') exit_code, output, errput = svntest.main.run_svnadmin("dump", repo_dir) svntest.verify.compare_and_display_lines( "Output of 'svnadmin dump' is unexpected.", @@ -452,15 +607,17 @@ def hotcopy_dot(sbox): os.chdir(backup_dir) svntest.actions.run_and_verify_svnadmin( - None, None, [], + None, [], "hotcopy", os.path.join(cwd, sbox.repo_dir), '.') os.chdir(cwd) if svntest.main.is_fs_type_fsfs(): check_hotcopy_fsfs(sbox.repo_dir, backup_dir) - else: + if svntest.main.is_fs_type_bdb(): check_hotcopy_bdb(sbox.repo_dir, backup_dir) + if svntest.main.is_fs_type_fsx(): + check_hotcopy_fsx(sbox.repo_dir, backup_dir) #---------------------------------------------------------------------- @@ -495,24 +652,29 @@ def hotcopy_format(sbox): #---------------------------------------------------------------------- def setrevprop(sbox): - "'setlog' and 'setrevprop', bypassing hooks'" + "setlog, setrevprop, delrevprop; bypass hooks" sbox.build() # Try a simple log property modification. iota_path = os.path.join(sbox.wc_dir, "iota") - exit_code, output, errput = svntest.main.run_svnadmin("setlog", - sbox.repo_dir, - "-r0", - "--bypass-hooks", - iota_path) - if errput: - logger.warn("Error: 'setlog' failed") - raise svntest.Failure + mu_path = sbox.ospath('A/mu') + svntest.actions.run_and_verify_svnadmin([], [], + "setlog", sbox.repo_dir, "-r0", + "--bypass-hooks", + iota_path) + + # Make sure it fails without --bypass-hooks. (We haven't called + # svntest.actions.enable_revprop_changes().) + # + # Note that we attempt to set the log message to a different value than the + # successful call. + svntest.actions.run_and_verify_svnadmin([], svntest.verify.AnyOutput, + "setlog", sbox.repo_dir, "-r0", + mu_path) # Verify that the revprop value matches what we set when retrieved # through the client. - svntest.actions.run_and_verify_svn(None, - [ "This is the file 'iota'.\n", "\n" ], + svntest.actions.run_and_verify_svn([ "This is the file 'iota'.\n", "\n" ], [], "propget", "--revprop", "-r0", "svn:log", sbox.wc_dir) @@ -530,10 +692,18 @@ def setrevprop(sbox): # Verify that the revprop value matches what we set when retrieved # through the client. - svntest.actions.run_and_verify_svn(None, [ "foo\n" ], [], "propget", + svntest.actions.run_and_verify_svn([ "foo\n" ], [], "propget", "--revprop", "-r0", "svn:author", sbox.wc_dir) + # Delete the property. + svntest.actions.run_and_verify_svnadmin([], [], + "delrevprop", "-r0", sbox.repo_dir, + "svn:author") + svntest.actions.run_and_verify_svnlook([], ".*E200017.*svn:author.*", + "propget", "--revprop", "-r0", + sbox.repo_dir, "svn:author") + def verify_windows_paths_in_repos(sbox): "verify a repository containing paths like 'c:hi'" @@ -542,28 +712,38 @@ def verify_windows_paths_in_repos(sbox): repo_url = sbox.repo_url chi_url = sbox.repo_url + '/c:hi' - svntest.actions.run_and_verify_svn(None, None, [], + svntest.actions.run_and_verify_svn(None, [], 'mkdir', '-m', 'log_msg', chi_url) exit_code, output, errput = svntest.main.run_svnadmin("verify", sbox.repo_dir) + if errput: + raise SVNUnexpectedStderr(errput) - # unfortunately, FSFS needs to do more checks than BDB resulting in - # different progress output - if svntest.main.is_fs_type_fsfs(): + # unfortunately, some backends needs to do more checks than other + # resulting in different progress output + if svntest.main.is_fs_log_addressing(): svntest.verify.compare_and_display_lines( "Error while running 'svnadmin verify'.", - 'STDERR', ["* Verifying repository metadata ...\n", + 'STDOUT', ["* Verifying metadata at revision 0 ...\n", + "* Verifying repository metadata ...\n", "* Verified revision 0.\n", "* Verified revision 1.\n", - "* Verified revision 2.\n"], errput) + "* Verified revision 2.\n"], output) + elif svntest.main.fs_has_rep_sharing(): + svntest.verify.compare_and_display_lines( + "Error while running 'svnadmin verify'.", + 'STDOUT', ["* Verifying repository metadata ...\n", + "* Verified revision 0.\n", + "* Verified revision 1.\n", + "* Verified revision 2.\n"], output) else: svntest.verify.compare_and_display_lines( "Error while running 'svnadmin verify'.", - 'STDERR', ["* Verified revision 0.\n", + 'STDOUT', ["* Verified revision 0.\n", "* Verified revision 1.\n", - "* Verified revision 2.\n"], errput) + "* Verified revision 2.\n"], output) #---------------------------------------------------------------------- @@ -596,12 +776,14 @@ def verify_incremental_fsfs(sbox): """svnadmin verify detects corruption dump can't""" # setup a repo with a directory 'c:hi' - sbox.build(create_wc = False) + # use physical addressing as this is hard to provoke with logical addressing + sbox.build(create_wc = False, + minor_version = min(svntest.main.options.server_minor_version,8)) repo_url = sbox.repo_url E_url = sbox.repo_url + '/A/B/E' # Create A/B/E/bravo in r2. - svntest.actions.run_and_verify_svn(None, None, [], + svntest.actions.run_and_verify_svn(None, [], 'mkdir', '-m', 'log_msg', E_url + '/bravo') # Corrupt r2's reference to A/C by replacing "dir 7-1.0.r1/1568" with @@ -834,7 +1016,7 @@ def load_with_parent_dir(sbox): "'svnadmin load --parent-dir' reparents mergeinfo" ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2983. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', @@ -842,20 +1024,18 @@ def load_with_parent_dir(sbox): dumpfile = open(dumpfile_location).read() # Create 'sample' dir in sbox.repo_url, and load the dump stream there. - svntest.actions.run_and_verify_svn(None, - ['\n', 'Committed revision 1.\n'], + svntest.actions.run_and_verify_svn(['Committing transaction...\n', + 'Committed revision 1.\n'], [], "mkdir", sbox.repo_url + "/sample", "-m", "Create sample dir") load_dumpstream(sbox, dumpfile, '--parent-dir', '/sample') # Verify the svn:mergeinfo properties for '--parent-dir' - svntest.actions.run_and_verify_svn(None, - [sbox.repo_url + + svntest.actions.run_and_verify_svn([sbox.repo_url + "/sample/branch - /sample/trunk:5-7\n"], [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url + '/sample/branch') - svntest.actions.run_and_verify_svn(None, - [sbox.repo_url + + svntest.actions.run_and_verify_svn([sbox.repo_url + "/sample/branch1 - " + "/sample/branch:6-9\n"], [], 'propget', 'svn:mergeinfo', '-R', @@ -864,21 +1044,19 @@ def load_with_parent_dir(sbox): # Create 'sample-2' dir in sbox.repo_url, and load the dump stream again. # This time, don't include a leading slash on the --parent-dir argument. # See issue #3547. - svntest.actions.run_and_verify_svn(None, - ['\n', 'Committed revision 11.\n'], + svntest.actions.run_and_verify_svn(['Committing transaction...\n', + 'Committed revision 11.\n'], [], "mkdir", sbox.repo_url + "/sample-2", "-m", "Create sample-2 dir") load_dumpstream(sbox, dumpfile, '--parent-dir', 'sample-2') # Verify the svn:mergeinfo properties for '--parent-dir'. - svntest.actions.run_and_verify_svn(None, - [sbox.repo_url + + svntest.actions.run_and_verify_svn([sbox.repo_url + "/sample-2/branch - " + "/sample-2/trunk:15-17\n"], [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url + '/sample-2/branch') - svntest.actions.run_and_verify_svn(None, - [sbox.repo_url + + svntest.actions.run_and_verify_svn([sbox.repo_url + "/sample-2/branch1 - " + "/sample-2/branch:16-19\n"], [], 'propget', 'svn:mergeinfo', '-R', @@ -898,11 +1076,11 @@ def set_uuid(sbox): orig_uuid = output[0].rstrip() # Try setting a new, bogus UUID. - svntest.actions.run_and_verify_svnadmin(None, None, '^.*Malformed UUID.*$', + svntest.actions.run_and_verify_svnadmin(None, '^.*Malformed UUID.*$', 'setuuid', sbox.repo_dir, 'abcdef') # Try generating a brand new UUID. - svntest.actions.run_and_verify_svnadmin(None, [], None, + svntest.actions.run_and_verify_svnadmin([], None, 'setuuid', sbox.repo_dir) exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir) if errput: @@ -913,7 +1091,7 @@ def set_uuid(sbox): raise svntest.Failure # Now, try setting the UUID back to the original value. - svntest.actions.run_and_verify_svnadmin(None, [], None, + svntest.actions.run_and_verify_svnadmin([], None, 'setuuid', sbox.repo_dir, orig_uuid) exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir) if errput: @@ -930,7 +1108,7 @@ def reflect_dropped_renumbered_revs(sbox): ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3020. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svndumpfilter_tests_data', @@ -938,7 +1116,8 @@ def reflect_dropped_renumbered_revs(sbox): dumpfile = open(dumpfile_location).read() # Create 'toplevel' dir in sbox.repo_url - svntest.actions.run_and_verify_svn(None, ['\n', 'Committed revision 1.\n'], + svntest.actions.run_and_verify_svn(['Committing transaction...\n', + 'Committed revision 1.\n'], [], "mkdir", sbox.repo_url + "/toplevel", "-m", "Create toplevel dir") @@ -954,7 +1133,7 @@ def reflect_dropped_renumbered_revs(sbox): url + "/trunk - /branch1:5-9\n", url + "/toplevel/trunk - /toplevel/branch1:14-18\n", ]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -969,10 +1148,10 @@ def fsfs_recover_handle_missing_revs_or_revprops_file(sbox): # Commit up to r3, so we can test various recovery scenarios. svntest.main.file_append(os.path.join(sbox.wc_dir, 'iota'), 'newer line\n') - svntest.main.run_svn(None, 'ci', sbox.wc_dir, '--quiet', '-m', 'log msg') + sbox.simple_commit(message='log msg') svntest.main.file_append(os.path.join(sbox.wc_dir, 'iota'), 'newest line\n') - svntest.main.run_svn(None, 'ci', sbox.wc_dir, '--quiet', '-m', 'log msg') + sbox.simple_commit(message='log msg') rev_3 = fsfs_file(sbox.repo_dir, 'revs', '3') rev_was_3 = rev_3 + '.was' @@ -1029,20 +1208,19 @@ def fsfs_recover_handle_missing_revs_or_revprops_file(sbox): ".*Revision 3 has a non-file where its revprops file should be.*"): raise svntest.Failure + # Restore the r3 revprops file, thus repairing the repository. + os.rmdir(revprop_3) + os.rename(revprop_was_3, revprop_3) + #---------------------------------------------------------------------- +@Skip(svntest.main.tests_use_prepacakaged_repository) def create_in_repo_subdir(sbox): "'svnadmin create /path/to/repo/subdir'" + sbox.build(create_wc=False, empty=True) repo_dir = sbox.repo_dir - wc_dir = sbox.wc_dir - - svntest.main.safe_rmtree(repo_dir, 1) - svntest.main.safe_rmtree(wc_dir) - - # This should succeed - svntest.main.create_repos(repo_dir) success = False try: @@ -1070,22 +1248,21 @@ def create_in_repo_subdir(sbox): @SkipUnless(svntest.main.is_fs_type_fsfs) +@SkipDumpLoadCrossCheck() def verify_with_invalid_revprops(sbox): "svnadmin verify detects invalid revprops file" + sbox.build(create_wc=False, empty=True) repo_dir = sbox.repo_dir - svntest.main.safe_rmtree(repo_dir, 1) - - # This should succeed - svntest.main.create_repos(repo_dir) - # Run a test verify exit_code, output, errput = svntest.main.run_svnadmin("verify", sbox.repo_dir) + if errput: + raise SVNUnexpectedStderr(errput) if svntest.verify.verify_outputs( - "Output of 'svnadmin verify' is unexpected.", None, errput, None, + "Output of 'svnadmin verify' is unexpected.", None, output, None, ".*Verified revision 0*"): raise svntest.Failure @@ -1127,7 +1304,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): "don't filter mergeinfo revs from incremental dump" # Create an empty repos. - test_create(sbox) + sbox.build(empty=True) # PART 1: Load a full dump to an empty repository. # @@ -1139,7 +1316,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): # | | | | # trunk---r2---r3-----r5---r6-------r8---r9---------------> | | # r1 | | | | | | - # intial | | | |______ | | + # initial | | | |______ | | # import copy | copy | merge merge # | | | merge (r5) (r8) # | | | (r9) | | @@ -1187,7 +1364,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): url + "B2 - /trunk:9\n", url + "B1/B/E - /branches/B2/B/E:11-12\n", "/trunk/B/E:5-6,8-9\n"]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -1216,7 +1393,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): dump_fp.close() # Blow away the current repos and create an empty one in its place. - test_create(sbox) + sbox.build(empty=True) # Load the three incremental dump files in sequence. load_dumpstream(sbox, open(dump_file_r1_10).read(), '--ignore-uuid') @@ -1226,7 +1403,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): # Check the mergeinfo, we use the same expected output as before, # as it (duh!) should be exactly the same as when we loaded the # repos in one shot. - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -1236,7 +1413,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): # PART 3: Load a full dump to an non-empty repository. # # Reset our sandbox. - test_create(sbox) + sbox.build(empty=True) # Load this skeleton repos into the empty target: # @@ -1280,14 +1457,14 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): url + "B2 - /Projects/Project-X/trunk:15\n", url + "B1/B/E - /Projects/Project-X/branches/B2/B/E:17-18\n", "/Projects/Project-X/trunk/B/E:11-12,14-15\n"]) - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) # PART 4: Load a a series of incremental dumps to an non-empty repository. # # Reset our sandbox. - test_create(sbox) + sbox.build(empty=True) # Load this skeleton repos into the empty target: load_dumpstream(sbox, dumpfile_skeleton, '--ignore-uuid') @@ -1303,7 +1480,7 @@ def dont_drop_valid_mergeinfo_during_incremental_loads(sbox): # Check the resulting mergeinfo. We expect the exact same results # as Part 3. # See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16. - svntest.actions.run_and_verify_svn(None, expected_output, [], + svntest.actions.run_and_verify_svn(expected_output, [], 'propget', 'svn:mergeinfo', '-R', sbox.repo_url) @@ -1315,14 +1492,12 @@ def hotcopy_symlink(sbox): ## See http://subversion.tigris.org/issues/show_bug.cgi?id=2591. ## + # Create a repository. + sbox.build(create_wc=False, empty=True) original_repo = sbox.repo_dir hotcopy_repo, hotcopy_url = sbox.add_repo_path('hotcopy') - # Create a repository. - svntest.main.safe_rmtree(original_repo, 1) - svntest.main.create_repos(original_repo) - # Create a file, a dir and a missing path outside the repoitory. svntest.main.safe_rmtree(sbox.wc_dir, 1) os.mkdir(sbox.wc_dir) @@ -1355,7 +1530,7 @@ def hotcopy_symlink(sbox): os.symlink(target_abspath, symlink_path + '_abs') svntest.actions.run_and_verify_svnadmin( - None, None, [], + None, [], "hotcopy", original_repo, hotcopy_repo) # Check if the symlinks were copied correctly. @@ -1418,7 +1593,7 @@ text """ - test_create(sbox) + sbox.build(empty=True) # Try to load the dumpstream, expecting a failure (because of mixed EOLs). load_and_verify_dumpstream(sbox, [], svntest.verify.AnyOutput, @@ -1440,7 +1615,11 @@ def verify_non_utf8_paths(sbox): "svnadmin verify with non-UTF-8 paths" dumpfile = clean_dumpfile() - test_create(sbox) + + # Corruption only possible in physically addressed revisions created + # with pre-1.6 servers. + sbox.build(empty=True, + minor_version=min(svntest.main.options.server_minor_version,8)) # Load the dumpstream load_and_verify_dumpstream(sbox, [], [], dumpfile_revisions, False, @@ -1457,15 +1636,15 @@ def verify_non_utf8_paths(sbox): if line == "A\n": # replace 'A' with a latin1 character -- the new path is not valid UTF-8 fp_new.write("\xE6\n") - elif line == "text: 1 279 32 0 d63ecce65d8c428b86f4f8b0920921fe\n": - # fix up the representation checksum - fp_new.write("text: 1 279 32 0 b50b1d5ed64075b5f632f3b8c30cd6b2\n") - elif line == "text: 1 280 32 32 d63ecce65d8c428b86f4f8b0920921fe\n": - # fix up the representation checksum - fp_new.write("text: 1 280 32 32 b50b1d5ed64075b5f632f3b8c30cd6b2\n") + elif line == "text: 1 279 32 32 d63ecce65d8c428b86f4f8b0920921fe\n": + # phys, PLAIN directories: fix up the representation checksum + fp_new.write("text: 1 279 32 32 b50b1d5ed64075b5f632f3b8c30cd6b2\n") elif line == "text: 1 292 44 32 a6be7b4cf075fd39e6a99eb69a31232b\n": - # fix up the representation checksum + # phys, deltified directories: fix up the representation checksum fp_new.write("text: 1 292 44 32 f2e93e73272cac0f18fccf16f224eb93\n") + elif line == "text: 1 6 31 31 90f306aa9bfd72f456072076a2bd94f7\n": + # log addressing: fix up the representation checksum + fp_new.write("text: 1 6 31 31 db2d4a0bad5dff0aea9a288dec02f1fb\n") elif line == "cpath: /A\n": # also fix up the 'created path' field fp_new.write("cpath: /\xE6\n") @@ -1491,8 +1670,8 @@ def verify_non_utf8_paths(sbox): expected_stderr = [ "* Dumped revision 0.\n", "WARNING 0x0002: E160005: " - "While validating fspath '?\\230': " - "Path '?\\230' is not in UTF-8" + "While validating fspath '?\\E6': " + "Path '?\\E6' is not in UTF-8" "\n", "* Dumped revision 1.\n", ] @@ -1515,12 +1694,12 @@ def test_lslocks_and_rmlocks(sbox): if exit_code or errput or output: raise svntest.Failure("Error: 'lslocks' failed") - expected_output = UnorderedOutput( - ["'A/B/lambda' locked by user 'jrandom'.\n", - "'iota' locked by user 'jrandom'.\n"]) + expected_output = svntest.verify.UnorderedRegexListOutput( + ["'.*lambda' locked by user 'jrandom'.\n", + "'.*iota' locked by user 'jrandom'.\n"]) # Lock iota and A/B/lambda using svn client - svntest.actions.run_and_verify_svn(None, expected_output, + svntest.actions.run_and_verify_svn(expected_output, [], "lock", "-m", "Locking files", iota_url, lambda_url) @@ -1582,7 +1761,7 @@ def load_ranges(sbox): "'svnadmin load --revision X:Y'" ## See http://subversion.tigris.org/issues/show_bug.cgi?id=3734. ## - test_create(sbox) + sbox.build(empty=True) dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), 'svnadmin_tests_data', @@ -1593,17 +1772,27 @@ def load_ranges(sbox): # Load our dumpfile, 2 revisions at a time, verifying that we have # the correct youngest revision after each load. load_dumpstream(sbox, dumpdata, '-r0:2') - svntest.actions.run_and_verify_svnlook("Unexpected output", ['2\n'], + svntest.actions.run_and_verify_svnlook(['2\n'], None, 'youngest', sbox.repo_dir) load_dumpstream(sbox, dumpdata, '-r3:4') - svntest.actions.run_and_verify_svnlook("Unexpected output", ['4\n'], + svntest.actions.run_and_verify_svnlook(['4\n'], None, 'youngest', sbox.repo_dir) load_dumpstream(sbox, dumpdata, '-r5:6') - svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'], + svntest.actions.run_and_verify_svnlook(['6\n'], None, 'youngest', sbox.repo_dir) # There are ordering differences in the property blocks. - expected_dump = UnorderedOutput(dumplines) + if (svntest.main.options.server_minor_version < 6): + temp = [] + + for line in dumplines: + if not "Text-content-sha1:" in line: + temp.append(line) + + expected_dump = UnorderedOutput(temp) + else: + expected_dump = UnorderedOutput(dumplines) + new_dumpdata = svntest.actions.run_and_verify_dump(sbox.repo_dir) svntest.verify.compare_and_display_lines("Dump files", "DUMP", expected_dump, new_dumpdata) @@ -1620,7 +1809,7 @@ def hotcopy_incremental(sbox): for i in [1, 2, 3]: os.chdir(backup_dir) svntest.actions.run_and_verify_svnadmin( - None, None, [], + None, [], "hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.') os.chdir(cwd) @@ -1632,28 +1821,30 @@ def hotcopy_incremental(sbox): sbox.simple_commit() @SkipUnless(svntest.main.is_fs_type_fsfs) +@SkipUnless(svntest.main.fs_has_pack) def hotcopy_incremental_packed(sbox): "'svnadmin hotcopy --incremental' with packing" + + # Configure two files per shard to trigger packing. sbox.build() + patch_format(sbox.repo_dir, shard_size=2) backup_dir, backup_url = sbox.add_repo_path('backup') os.mkdir(backup_dir) cwd = os.getcwd() - # Configure two files per shard to trigger packing - format_file = open(os.path.join(sbox.repo_dir, 'db', 'format'), 'wb') - format_file.write("6\nlayout sharded 2\n") - format_file.close() - # Pack revisions 0 and 1. - svntest.actions.run_and_verify_svnadmin( - None, ['Packing revisions in shard 0...done.\n'], [], "pack", - os.path.join(cwd, sbox.repo_dir)) + # Pack revisions 0 and 1 if not already packed. + if not (svntest.main.is_fs_type_fsfs and svntest.main.options.fsfs_packing + and svntest.main.options.fsfs_sharding == 2): + svntest.actions.run_and_verify_svnadmin( + ['Packing revisions in shard 0...done.\n'], [], "pack", + os.path.join(cwd, sbox.repo_dir)) # Commit 5 more revs, hotcopy and pack after each commit. for i in [1, 2, 3, 4, 5]: os.chdir(backup_dir) svntest.actions.run_and_verify_svnadmin( - None, None, [], + None, [], "hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.') os.chdir(cwd) @@ -1663,12 +1854,13 @@ def hotcopy_incremental_packed(sbox): if i < 5: sbox.simple_mkdir("newdir-%i" % i) sbox.simple_commit() - if not i % 2: + if (svntest.main.is_fs_type_fsfs and not svntest.main.options.fsfs_packing + and not i % 2): expected_output = ['Packing revisions in shard %d...done.\n' % (i/2)] else: expected_output = [] svntest.actions.run_and_verify_svnadmin( - None, expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir)) + expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir)) def locking(sbox): @@ -1683,7 +1875,7 @@ def locking(sbox): # Test illegal character in comment file. expected_error = ".*svnadmin: E130004:.*" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "lock", sbox.repo_dir, "iota", "jrandom", @@ -1691,7 +1883,7 @@ def locking(sbox): # Test locking path with --bypass-hooks expected_output = "'iota' locked by user 'jrandom'." - svntest.actions.run_and_verify_svnadmin(None, expected_output, + svntest.actions.run_and_verify_svnadmin(expected_output, None, "lock", sbox.repo_dir, "iota", "jrandom", @@ -1699,13 +1891,13 @@ def locking(sbox): "--bypass-hooks") # Remove lock - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, None, "rmlocks", sbox.repo_dir, "iota") # Test locking path without --bypass-hooks expected_output = "'iota' locked by user 'jrandom'." - svntest.actions.run_and_verify_svnadmin(None, expected_output, + svntest.actions.run_and_verify_svnadmin(expected_output, None, "lock", sbox.repo_dir, "iota", "jrandom", @@ -1713,7 +1905,7 @@ def locking(sbox): # Test locking already locked path. expected_error = ".*svnadmin: E160035:.*" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "lock", sbox.repo_dir, "iota", "jrandom", @@ -1721,7 +1913,7 @@ def locking(sbox): # Test locking non-existent path. expected_error = ".*svnadmin: E160013:.*" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "lock", sbox.repo_dir, "non-existent", "jrandom", @@ -1730,7 +1922,7 @@ def locking(sbox): # Test locking a path while specifying a lock token. expected_output = "'A/D/G/rho' locked by user 'jrandom'." lock_token = "opaquelocktoken:01234567-89ab-cdef-89ab-cdef01234567" - svntest.actions.run_and_verify_svnadmin(None, expected_output, + svntest.actions.run_and_verify_svnadmin(expected_output, None, "lock", sbox.repo_dir, "A/D/G/rho", "jrandom", @@ -1739,7 +1931,7 @@ def locking(sbox): # Test unlocking a path, but provide the wrong lock token. expected_error = ".*svnadmin: E160040:.*" wrong_lock_token = "opaquelocktoken:12345670-9ab8-defc-9ab8-def01234567c" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "unlock", sbox.repo_dir, "A/D/G/rho", "jrandom", @@ -1748,7 +1940,7 @@ def locking(sbox): # Test unlocking the path again, but this time provide the correct # lock token. expected_output = "'A/D/G/rho' unlocked." - svntest.actions.run_and_verify_svnadmin(None, expected_output, + svntest.actions.run_and_verify_svnadmin(expected_output, None, "unlock", sbox.repo_dir, "A/D/G/rho", "jrandom", @@ -1763,7 +1955,7 @@ def locking(sbox): # Test locking a path. Don't use --bypass-hooks, though, as we wish # to verify that hook script is really getting executed. expected_error = ".*svnadmin: E165001:.*" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "lock", sbox.repo_dir, "iota", "jrandom", @@ -1785,7 +1977,7 @@ def locking(sbox): # Try to unlock a path while providing the correct lock token but # with a preventative hook in place. expected_error = ".*svnadmin: E165001:.*" - svntest.actions.run_and_verify_svnadmin(None, None, + svntest.actions.run_and_verify_svnadmin(None, expected_error, "unlock", sbox.repo_dir, "iota", "jrandom", @@ -1794,7 +1986,7 @@ def locking(sbox): # Finally, use --bypass-hooks to unlock the path (again using the # correct lock token). expected_output = "'iota' unlocked." - svntest.actions.run_and_verify_svnadmin(None, expected_output, + svntest.actions.run_and_verify_svnadmin(expected_output, None, "unlock", "--bypass-hooks", sbox.repo_dir, @@ -1842,15 +2034,370 @@ def mergeinfo_race(sbox): @Issue(4213) +@Skip(svntest.main.is_fs_type_fsx) def recover_old_empty(sbox): "recover empty --compatible-version=1.3" - svntest.main.safe_rmtree(sbox.repo_dir, 1) - svntest.main.create_repos(sbox.repo_dir, minor_version=3) - svntest.actions.run_and_verify_svnadmin(None, None, [], + sbox.build(create_wc=False, empty=True, minor_version=3) + svntest.actions.run_and_verify_svnadmin(None, [], "recover", sbox.repo_dir) @SkipUnless(svntest.main.is_fs_type_fsfs) +def verify_keep_going(sbox): + "svnadmin verify --keep-going test" + + sbox.build(create_wc = False) + repo_url = sbox.repo_url + B_url = sbox.repo_url + '/B' + C_url = sbox.repo_url + '/C' + + # Create A/B/E/bravo in r2. + svntest.actions.run_and_verify_svn(None, [], + 'mkdir', '-m', 'log_msg', + B_url) + + svntest.actions.run_and_verify_svn(None, [], + 'mkdir', '-m', 'log_msg', + C_url) + + r2 = fsfs_file(sbox.repo_dir, 'revs', '2') + fp = open(r2, 'r+b') + fp.write("""inserting junk to corrupt the rev""") + fp.close() + exit_code, output, errput = svntest.main.run_svnadmin("verify", + "--keep-going", + sbox.repo_dir) + + exp_out = svntest.verify.RegexListOutput([".*Verified revision 0.", + ".*Verified revision 1.", + ".*", + ".*Summary.*", + ".*r2: E160004:.*", + ".*r2: E160004:.*", + ".*r3: E160004:.*", + ".*r3: E160004:.*"]) + + if (svntest.main.fs_has_rep_sharing()): + exp_out.insert(0, ".*Verifying.*metadata.*") + + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*", + ".*Error verifying revision 3.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*", + "svnadmin: E205012:.*"], False) + + if (svntest.main.is_fs_log_addressing()): + exp_err.insert(0, ".*Error verifying repository metadata.") + exp_err.insert(1, "svnadmin: E160004:.*") + + if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + sbox.repo_dir) + + if (svntest.main.is_fs_log_addressing()): + exp_out = svntest.verify.RegexListOutput([".*Verifying metadata at revision 0"]) + else: + exp_out = svntest.verify.RegexListOutput([".*Verified revision 0.", + ".*Verified revision 1."]) + if (svntest.main.fs_has_rep_sharing()): + exp_out.insert(0, ".*Verifying repository metadata.*") + + if (svntest.main.is_fs_log_addressing()): + exp_err = svntest.verify.RegexListOutput([ + ".*Error verifying repository metadata.", + "svnadmin: E160004:.*"], False) + else: + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*"], False) + + if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + "--quiet", + sbox.repo_dir) + + if (svntest.main.is_fs_log_addressing()): + exp_err = svntest.verify.RegexListOutput([ + ".*Error verifying repository metadata.", + "svnadmin: E160004:.*"], False) + else: + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*"], False) + + if svntest.verify.verify_outputs("Output of 'svnadmin verify' is unexpected.", + None, errput, None, exp_err): + raise svntest.Failure + + # Don't leave a corrupt repository + svntest.main.safe_rmtree(sbox.repo_dir, True) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +def verify_keep_going_quiet(sbox): + "svnadmin verify --keep-going --quiet test" + + sbox.build(create_wc = False) + repo_url = sbox.repo_url + B_url = sbox.repo_url + '/B' + C_url = sbox.repo_url + '/C' + + # Create A/B/E/bravo in r2. + svntest.actions.run_and_verify_svn(None, [], + 'mkdir', '-m', 'log_msg', + B_url) + + svntest.actions.run_and_verify_svn(None, [], + 'mkdir', '-m', 'log_msg', + C_url) + + r2 = fsfs_file(sbox.repo_dir, 'revs', '2') + fp = open(r2, 'r+b') + fp.write("""inserting junk to corrupt the rev""") + fp.close() + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + "--keep-going", + "--quiet", + sbox.repo_dir) + + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*", + ".*Error verifying revision 3.", + "svnadmin: E160004:.*", + "svnadmin: E160004:.*", + "svnadmin: E205012:.*"], False) + + # Insert another expected error from checksum verification + if (svntest.main.is_fs_log_addressing()): + exp_err.insert(0, ".*Error verifying repository metadata.") + exp_err.insert(1, "svnadmin: E160004:.*") + + if svntest.verify.verify_outputs( + "Unexpected error while running 'svnadmin verify'.", + output, errput, None, exp_err): + raise svntest.Failure + + # Don't leave a corrupt repository + svntest.main.safe_rmtree(sbox.repo_dir, True) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +def verify_invalid_path_changes(sbox): + "detect invalid changed path list entries" + + sbox.build(create_wc = False) + repo_url = sbox.repo_url + + # Create a number of revisions each adding a single path + for r in range(2,20): + svntest.actions.run_and_verify_svn(None, [], + 'mkdir', '-m', 'log_msg', + sbox.repo_url + '/B' + str(r)) + + # modify every other revision to make sure that errors are not simply + # "carried over" but that all corrupts we get detected independently + + # add existing node + set_changed_path_list(sbox, 2, + "_0.0.t1-1 add-dir false false /A\n\n") + + # add into non-existent parent + set_changed_path_list(sbox, 4, + "_0.0.t3-2 add-dir false false /C/X\n\n") + + # del non-existent node + set_changed_path_list(sbox, 6, + "_0.0.t5-2 delete-dir false false /C\n\n") + + # del existent node of the wrong kind + # + # THIS WILL NOT BE DETECTED + # since dump mechanism and file don't care about the types of deleted nodes + set_changed_path_list(sbox, 8, + "_0.0.t7-2 delete-file false false /B3\n\n") + + # copy from non-existent node + set_changed_path_list(sbox, 10, + "_0.0.t9-2 add-dir false false /B10\n" + "6 /B8\n") + + # copy from existing node of the wrong kind + set_changed_path_list(sbox, 12, + "_0.0.t11-2 add-file false false /B12\n" + "9 /B8\n") + + # modify non-existent node + set_changed_path_list(sbox, 14, + "_0.0.t13-2 modify-file false false /A/D/H/foo\n\n") + + # modify existent node of the wrong kind + set_changed_path_list(sbox, 16, + "_0.0.t15-2 modify-file false false /B12\n\n") + + # replace non-existent node + set_changed_path_list(sbox, 18, + "_0.0.t17-2 replace-file false false /A/D/H/foo\n\n") + + # find corruptions + exit_code, output, errput = svntest.main.run_svnadmin("verify", + "--keep-going", + sbox.repo_dir) + + exp_out = svntest.verify.RegexListOutput([".*Verified revision 0.", + ".*Verified revision 1.", + ".*Verified revision 3.", + ".*Verified revision 5.", + ".*Verified revision 7.", + ".*Verified revision 8.", + ".*Verified revision 9.", + ".*Verified revision 11.", + ".*Verified revision 13.", + ".*Verified revision 15.", + ".*Verified revision 17.", + ".*Verified revision 19.", + ".*", + ".*Summary.*", + ".*r2: E160020:.*", + ".*r2: E160020:.*", + ".*r4: E160013:.*", + ".*r6: E160013:.*", + ".*r6: E160013:.*", + ".*r10: E160013:.*", + ".*r10: E160013:.*", + ".*r12: E145001:.*", + ".*r12: E145001:.*", + ".*r14: E160013:.*", + ".*r14: E160013:.*", + ".*r16: E145001:.*", + ".*r16: E145001:.*", + ".*r18: E160013:.*", + ".*r18: E160013:.*"]) + if (svntest.main.fs_has_rep_sharing()): + exp_out.insert(0, ".*Verifying.*metadata.*") + if svntest.main.is_fs_log_addressing(): + exp_out.insert(1, ".*Verifying.*metadata.*") + + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160020:.*", + "svnadmin: E160020:.*", + ".*Error verifying revision 4.", + "svnadmin: E160013:.*", + ".*Error verifying revision 6.", + "svnadmin: E160013:.*", + "svnadmin: E160013:.*", + ".*Error verifying revision 10.", + "svnadmin: E160013:.*", + "svnadmin: E160013:.*", + ".*Error verifying revision 12.", + "svnadmin: E145001:.*", + "svnadmin: E145001:.*", + ".*Error verifying revision 14.", + "svnadmin: E160013:.*", + "svnadmin: E160013:.*", + ".*Error verifying revision 16.", + "svnadmin: E145001:.*", + "svnadmin: E145001:.*", + ".*Error verifying revision 18.", + "svnadmin: E160013:.*", + "svnadmin: E160013:.*", + "svnadmin: E205012:.*"], False) + + + if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + sbox.repo_dir) + + exp_out = svntest.verify.RegexListOutput([".*Verified revision 0.", + ".*Verified revision 1."]) + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160020:.*", + "svnadmin: E160020:.*"], False) + + if (svntest.main.fs_has_rep_sharing()): + exp_out.insert(0, ".*Verifying.*metadata.*") + if svntest.main.is_fs_log_addressing(): + exp_out.insert(1, ".*Verifying.*metadata.*") + if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + "--quiet", + sbox.repo_dir) + + exp_out = [] + exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.", + "svnadmin: E160020:.*", + "svnadmin: E160020:.*"], False) + + if svntest.verify.verify_outputs("Output of 'svnadmin verify' is unexpected.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + # Don't leave a corrupt repository + svntest.main.safe_rmtree(sbox.repo_dir, True) + + +def verify_denormalized_names(sbox): + "detect denormalized names and name collisions" + + sbox.build(create_wc=False, empty=True) + + dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), + 'svnadmin_tests_data', + 'normalization_check.dump') + load_dumpstream(sbox, open(dumpfile_location).read()) + + exit_code, output, errput = svntest.main.run_svnadmin( + "verify", "--check-normalization", sbox.repo_dir) + + expected_output_regex_list = [ + ".*Verified revision 0.", + ".*Verified revision 1.", + ".*Verified revision 2.", + ".*Verified revision 3.", + # A/{Eacute}/{aring}lpha + "WARNING 0x0003: Duplicate representation of path 'A/.*/.*lpha'", + ".*Verified revision 4.", + ".*Verified revision 5.", + # Q/{aring}lpha + "WARNING 0x0004: Duplicate representation of path '/Q/.*lpha'" + # A/{Eacute} + " in svn:mergeinfo property of 'A/.*'", + ".*Verified revision 6.", + ".*Verified revision 7."] + + # The BDB backend doesn't do global metadata verification. + if (svntest.main.fs_has_rep_sharing()): + expected_output_regex_list.insert(0, ".*Verifying repository metadata.*") + + if svntest.main.is_fs_log_addressing(): + expected_output_regex_list.insert(0, ".* Verifying metadata at revision 0.*") + + exp_out = svntest.verify.RegexListOutput(expected_output_regex_list) + exp_err = svntest.verify.ExpectedOutput([]) + + svntest.verify.verify_outputs( + "Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) def fsfs_recover_old_non_empty(sbox): "fsfs recover non-empty --compatible-version=1.3" @@ -1859,7 +2406,7 @@ def fsfs_recover_old_non_empty(sbox): # svnadmin: E200002: Serialized hash missing terminator sbox.build(create_wc=False, minor_version=3) - svntest.actions.run_and_verify_svnadmin(None, None, [], "recover", + svntest.actions.run_and_verify_svnadmin(None, [], "recover", sbox.repo_dir) @@ -1873,12 +2420,694 @@ def fsfs_hotcopy_old_non_empty(sbox): sbox.build(create_wc=False, minor_version=3) backup_dir, backup_url = sbox.add_repo_path('backup') - svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy", + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", sbox.repo_dir, backup_dir) check_hotcopy_fsfs(sbox.repo_dir, backup_dir) +def load_ignore_dates(sbox): + "svnadmin load --ignore-dates" + + # All revisions in the loaded repository should come after this time. + start_time = time.localtime() + time.sleep(1) + + sbox.build(create_wc=False, empty=True) + + dumpfile_skeleton = open(os.path.join(os.path.dirname(sys.argv[0]), + 'svnadmin_tests_data', + 'skeleton_repos.dump')).read() + + load_dumpstream(sbox, dumpfile_skeleton, '--ignore-dates') + svntest.actions.run_and_verify_svnlook(['6\n'], + None, 'youngest', sbox.repo_dir) + for rev in range(1, 6): + exit_code, output, errput = svntest.main.run_svnlook('date', '-r', rev, + sbox.repo_dir) + if errput: + raise SVNUnexpectedStderr(errput) + rev_time = time.strptime(output[0].rstrip()[:19], '%Y-%m-%d %H:%M:%S') + if rev_time < start_time: + raise svntest.Failure("Revision time for r%d older than load start time\n" + " rev_time: %s\n" + " start_time: %s" + % (rev, str(rev_time), str(start_time))) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +def fsfs_hotcopy_old_with_id_changes(sbox): + "fsfs hotcopy old with node-id and copy-id changes" + + # Around trunk@1573728, running 'svnadmin hotcopy' for the + # --compatible-version=1.3 repository with certain node-id and copy-id + # changes ended with mismatching db/current in source and destination: + # + # source: "2 l 1" destination: "2 k 1", + # "3 l 2" "3 4 2" + # (and so on...) + # + # We test this case by creating a --compatible-version=1.3 repository + # and committing things that result in node-id and copy-id changes. + # After every commit, we hotcopy the repository to a new destination + # and check whether the source of the backup and the backup itself are + # identical. We also maintain a separate --incremental backup, which + # is updated and checked after every commit. + sbox.build(create_wc=True, minor_version=3) + + inc_backup_dir, inc_backup_url = sbox.add_repo_path('incremental-backup') + + # r1 = Initial greek tree sandbox. + backup_dir, backup_url = sbox.add_repo_path('backup-after-r1') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r2 = Add a new property. + sbox.simple_propset('foo', 'bar', 'A/mu') + sbox.simple_commit(message='r2') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r2') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r3 = Copy a file. + sbox.simple_copy('A/B/E', 'A/B/E1') + sbox.simple_commit(message='r3') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r3') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r4 = Remove an existing file ... + sbox.simple_rm('A/D/gamma') + sbox.simple_commit(message='r4') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r4') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r5 = ...and replace it with a new file here. + sbox.simple_add_text("This is the replaced file.\n", 'A/D/gamma') + sbox.simple_commit(message='r5') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r5') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r6 = Add an entirely new file. + sbox.simple_add_text('This is an entirely new file.\n', 'A/C/mu1') + sbox.simple_commit(message='r6') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r6') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + # r7 = Change the content of the existing file (this changeset does + # not bump the next-id and copy-id counters in the repository). + sbox.simple_append('A/mu', 'This is change in the existing file.\n') + sbox.simple_commit(message='r7') + + backup_dir, backup_url = sbox.add_repo_path('backup-after-r7') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + "--incremental", + sbox.repo_dir, inc_backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, backup_dir) + check_hotcopy_fsfs(sbox.repo_dir, inc_backup_dir) + + +@SkipUnless(svntest.main.fs_has_pack) +def verify_packed(sbox): + "verify packed with small shards" + + # Configure two files per shard to trigger packing. + sbox.build() + patch_format(sbox.repo_dir, shard_size=2) + + # Play with our greek tree. These changesets fall into two + # separate shards with r2 and r3 being in shard 1 ... + sbox.simple_append('iota', "Line.\n") + sbox.simple_append('A/D/gamma', "Another line.\n") + sbox.simple_commit(message='r2') + sbox.simple_propset('foo', 'bar', 'iota') + sbox.simple_propset('foo', 'baz', 'A/mu') + sbox.simple_commit(message='r3') + + # ...and r4 and r5 being in shard 2. + sbox.simple_rm('A/C') + sbox.simple_copy('A/B/E', 'A/B/E1') + sbox.simple_move('A/mu', 'A/B/mu') + sbox.simple_commit(message='r4') + sbox.simple_propdel('foo', 'A/B/mu') + sbox.simple_commit(message='r5') + + if svntest.main.is_fs_type_fsfs and svntest.main.options.fsfs_packing: + # With --fsfs-packing, everything is already packed and we + # can skip this part. + pass + else: + expected_output = ["Packing revisions in shard 0...done.\n", + "Packing revisions in shard 1...done.\n", + "Packing revisions in shard 2...done.\n"] + svntest.actions.run_and_verify_svnadmin(expected_output, [], + "pack", sbox.repo_dir) + + if svntest.main.is_fs_log_addressing(): + expected_output = ["* Verifying metadata at revision 0 ...\n", + "* Verifying metadata at revision 2 ...\n", + "* Verifying metadata at revision 4 ...\n", + "* Verifying repository metadata ...\n", + "* Verified revision 0.\n", + "* Verified revision 1.\n", + "* Verified revision 2.\n", + "* Verified revision 3.\n", + "* Verified revision 4.\n", + "* Verified revision 5.\n"] + else: + expected_output = ["* Verifying repository metadata ...\n", + "* Verified revision 0.\n", + "* Verified revision 1.\n", + "* Verified revision 2.\n", + "* Verified revision 3.\n", + "* Verified revision 4.\n", + "* Verified revision 5.\n"] + + svntest.actions.run_and_verify_svnadmin(expected_output, [], + "verify", sbox.repo_dir) + +# Test that 'svnadmin freeze' is nestable. (For example, this ensures it +# won't take system-global locks, only repository-scoped ones.) +# +# This could be useful to easily freeze a small number of repositories at once. +# +# ### We don't actually test that freeze takes a write lock anywhere (not even +# ### in C tests.) +def freeze_freeze(sbox): + "svnadmin freeze svnadmin freeze (some-cmd)" + + sbox.build(create_wc=False, read_only=True) + second_repo_dir, _ = sbox.add_repo_path('backup') + svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy", + sbox.repo_dir, second_repo_dir) + + if svntest.main.is_fs_type_fsx() or \ + (svntest.main.is_fs_type_fsfs() and \ + svntest.main.options.server_minor_version < 9): + # FSFS repositories created with --compatible-version=1.8 and less + # erroneously share the filesystem data (locks, shared transaction + # data, ...) between hotcopy source and destination. This is fixed + # for new FS formats, but in order to avoid a deadlock for old formats, + # we have to manually assign a new UUID for the hotcopy destination. + # As of trunk@1618024, the same applies to FSX repositories. + svntest.actions.run_and_verify_svnadmin([], None, + 'setuuid', second_repo_dir) + + svntest.actions.run_and_verify_svnadmin(None, [], + 'freeze', '--', sbox.repo_dir, + svntest.main.svnadmin_binary, 'freeze', '--', second_repo_dir, + sys.executable, '-c', 'True') + + arg_file = sbox.get_tempname() + svntest.main.file_write(arg_file, + "%s\n%s\n" % (sbox.repo_dir, second_repo_dir)) + + svntest.actions.run_and_verify_svnadmin(None, [], + 'freeze', '-F', arg_file, '--', + sys.executable, '-c', 'True') + +def verify_metadata_only(sbox): + "verify metadata only" + + sbox.build(create_wc = False) + exit_code, output, errput = svntest.main.run_svnadmin("verify", + sbox.repo_dir, + "--metadata-only") + if errput: + raise SVNUnexpectedStderr(errput) + + # Unfortunately, older formats won't test as thoroughly than newer ones + # resulting in different progress output. BDB will do a full check but + # not produce any output. + if svntest.main.is_fs_log_addressing(): + svntest.verify.compare_and_display_lines( + "Unexpected error while running 'svnadmin verify'.", + 'STDOUT', ["* Verifying metadata at revision 0 ...\n", + "* Verifying repository metadata ...\n"], output) + elif svntest.main.fs_has_rep_sharing() \ + and not svntest.main.is_fs_type_bdb(): + svntest.verify.compare_and_display_lines( + "Unexpected error while running 'svnadmin verify'.", + 'STDOUT', ["* Verifying repository metadata ...\n"], output) + else: + svntest.verify.compare_and_display_lines( + "Unexpected error while running 'svnadmin verify'.", + 'STDOUT', [], output) + + +@Skip(svntest.main.is_fs_type_bdb) +def verify_quickly(sbox): + "verify quickly using metadata" + + sbox.build(create_wc = False) + rev_file = open(fsfs_file(sbox.repo_dir, 'revs', '1'), 'r+b') + + # set new contents + rev_file.seek(8) + rev_file.write('#') + rev_file.close() + + exit_code, output, errput = svntest.main.run_svnadmin("verify", + sbox.repo_dir, + "--metadata-only") + + # unfortunately, some backends needs to do more checks than other + # resulting in different progress output + if svntest.main.is_fs_log_addressing(): + exp_out = svntest.verify.RegexListOutput([]) + exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*"], False) + else: + exp_out = svntest.verify.RegexListOutput([]) + exp_err = svntest.verify.RegexListOutput([]) + + if (svntest.main.fs_has_rep_sharing()): + exp_out.insert(0, ".*Verifying.*metadata.*") + if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.", + output, errput, exp_out, exp_err): + raise svntest.Failure + + # Don't leave a corrupt repository + svntest.main.safe_rmtree(sbox.repo_dir, True) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +@SkipUnless(svntest.main.fs_has_pack) +def fsfs_hotcopy_progress(sbox): + "hotcopy progress reporting" + + # Check how 'svnadmin hotcopy' reports progress for non-incremental + # and incremental scenarios. The progress output can be affected by + # the --fsfs-packing option, so skip the test if that is the case. + if svntest.main.options.fsfs_packing: + raise svntest.Skip + + # Create an empty repository, configure three files per shard. + sbox.build(create_wc=False, empty=True) + patch_format(sbox.repo_dir, shard_size=3) + + inc_backup_dir, inc_backup_url = sbox.add_repo_path('incremental-backup') + + # Nothing really exciting for the empty repository. + expected_full = [ + "* Copied revision 0.\n" + ] + expected_incremental = [ + "* Copied revision 0.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-0') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + # Commit three revisions. After this step we have a full shard + # (r0, r1, r2) and the second shard (r3) with a single revision. + for i in range(3): + svntest.actions.run_and_verify_svn(None, [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir-%i' % i) + expected_full = [ + "* Copied revision 0.\n", + "* Copied revision 1.\n", + "* Copied revision 2.\n", + "* Copied revision 3.\n", + ] + expected_incremental = [ + "* Copied revision 1.\n", + "* Copied revision 2.\n", + "* Copied revision 3.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-1') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + # Pack everything (r3 is still unpacked) and hotcopy again. In this case, + # the --incremental output should track the incoming (r0, r1, r2) pack and + # should not mention r3, because it is already a part of the destination + # and is *not* a part of the incoming pack. + svntest.actions.run_and_verify_svnadmin(None, [], 'pack', + sbox.repo_dir) + expected_full = [ + "* Copied revisions from 0 to 2.\n", + "* Copied revision 3.\n", + ] + expected_incremental = [ + "* Copied revisions from 0 to 2.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-2') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + # Fill the second shard, pack again, commit several unpacked revisions + # on top of it. Rerun the hotcopy and check the progress output. + for i in range(4, 6): + svntest.actions.run_and_verify_svn(None, [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir-%i' % i) + + svntest.actions.run_and_verify_svnadmin(None, [], 'pack', + sbox.repo_dir) + + for i in range(6, 8): + svntest.actions.run_and_verify_svn(None, [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir-%i' % i) + expected_full = [ + "* Copied revisions from 0 to 2.\n", + "* Copied revisions from 3 to 5.\n", + "* Copied revision 6.\n", + "* Copied revision 7.\n", + ] + expected_incremental = [ + "* Copied revisions from 3 to 5.\n", + "* Copied revision 6.\n", + "* Copied revision 7.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-3') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +def fsfs_hotcopy_progress_with_revprop_changes(sbox): + "incremental hotcopy progress with changed revprops" + + # The progress output can be affected by the --fsfs-packing + # option, so skip the test if that is the case. + if svntest.main.options.fsfs_packing: + raise svntest.Skip + + # Create an empty repository, commit several revisions and hotcopy it. + sbox.build(create_wc=False, empty=True) + + for i in range(6): + svntest.actions.run_and_verify_svn(None, [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir-%i' % i) + expected_output = [ + "* Copied revision 0.\n", + "* Copied revision 1.\n", + "* Copied revision 2.\n", + "* Copied revision 3.\n", + "* Copied revision 4.\n", + "* Copied revision 5.\n", + "* Copied revision 6.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup') + svntest.actions.run_and_verify_svnadmin(expected_output, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + + # Amend a few log messages in the source, run the --incremental hotcopy. + # The progress output should only mention the corresponding revisions. + revprop_file = sbox.get_tempname() + svntest.main.file_write(revprop_file, "Modified log message.") + + for i in [1, 3, 6]: + svntest.actions.run_and_verify_svnadmin(None, [], + 'setrevprop', + sbox.repo_dir, '-r', i, + 'svn:log', revprop_file) + expected_output = [ + "* Copied revision 1.\n", + "* Copied revision 3.\n", + "* Copied revision 6.\n", + ] + svntest.actions.run_and_verify_svnadmin(expected_output, [], + 'hotcopy', '--incremental', + sbox.repo_dir, backup_dir) + + +@SkipUnless(svntest.main.is_fs_type_fsfs) +def fsfs_hotcopy_progress_old(sbox): + "hotcopy --compatible-version=1.3 progress" + + sbox.build(create_wc=False, empty=True, minor_version=3) + + inc_backup_dir, inc_backup_url = sbox.add_repo_path('incremental-backup') + + # Nothing really exciting for the empty repository. + expected_full = [ + "* Copied revision 0.\n" + ] + expected_incremental = [ + "* Copied revision 0.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-0') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + # Commit three revisions, hotcopy and check the progress output. + for i in range(3): + svntest.actions.run_and_verify_svn(None, [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir-%i' % i) + + expected_full = [ + "* Copied revision 0.\n", + "* Copied revision 1.\n", + "* Copied revision 2.\n", + "* Copied revision 3.\n", + ] + expected_incremental = [ + "* Copied revision 1.\n", + "* Copied revision 2.\n", + "* Copied revision 3.\n", + ] + + backup_dir, backup_url = sbox.add_repo_path('backup-1') + svntest.actions.run_and_verify_svnadmin(expected_full, [], + 'hotcopy', + sbox.repo_dir, backup_dir) + svntest.actions.run_and_verify_svnadmin(expected_incremental, [], + 'hotcopy', '--incremental', + sbox.repo_dir, inc_backup_dir) + + +@SkipUnless(svntest.main.fs_has_unique_freeze) +def freeze_same_uuid(sbox): + "freeze multiple repositories with same UUID" + + sbox.build(create_wc=False) + + first_repo_dir, _ = sbox.add_repo_path('first') + second_repo_dir, _ = sbox.add_repo_path('second') + + # Test that 'svnadmin freeze A (svnadmin freeze B)' does not deadlock for + # new FSFS formats, even if 'A' and 'B' share the same UUID. Create two + # repositories by loading the same dump file, ... + svntest.main.create_repos(first_repo_dir) + svntest.main.create_repos(second_repo_dir) + + dump_path = os.path.join(os.path.dirname(sys.argv[0]), + 'svnadmin_tests_data', + 'skeleton_repos.dump') + dump_contents = open(dump_path, 'rb').readlines() + svntest.actions.run_and_verify_load(first_repo_dir, dump_contents) + svntest.actions.run_and_verify_load(second_repo_dir, dump_contents) + + # ...and execute the 'svnadmin freeze -F' command. + arg_file = sbox.get_tempname() + svntest.main.file_write(arg_file, + "%s\n%s\n" % (first_repo_dir, second_repo_dir)) + + svntest.actions.run_and_verify_svnadmin(None, None, + 'freeze', '-F', arg_file, '--', + sys.executable, '-c', 'True') + + +@Skip(svntest.main.is_fs_type_fsx) +def upgrade(sbox): + "upgrade --compatible-version=1.3" + + sbox.build(create_wc=False, minor_version=3) + svntest.actions.run_and_verify_svnadmin(None, [], "upgrade", + sbox.repo_dir) + # Does the repository work after upgrade? + svntest.actions.run_and_verify_svn(['Committing transaction...\n', + 'Committed revision 2.\n'], [], 'mkdir', + '-m', svntest.main.make_log_msg(), + sbox.repo_url + '/dir') + +def load_txdelta(sbox): + "exercising svn_txdelta_target on BDB" + + sbox.build(empty=True) + + # This dumpfile produced a BDB repository that generated cheksum + # mismatches on read caused by the improper handling of + # svn_txdelta_target ops. The bug was fixed by r1640832. + + dumpfile_location = os.path.join(os.path.dirname(sys.argv[0]), + 'svnadmin_tests_data', + 'load_txdelta.dump.gz') + dumpfile = gzip.open(dumpfile_location).read() + + load_dumpstream(sbox, dumpfile) + + # Verify would fail with a checksum mismatch: + # * Error verifying revision 14. + # svnadmin: E200014: MD5 checksum mismatch on representation 'r': + # expected: 5182e8876ed894dc7fe28f6ff5b2fee6 + # actual: 5121f82875508863ad70daa8244e6947 + + exit_code, output, errput = svntest.main.run_svnadmin("verify", sbox.repo_dir) + if errput: + raise SVNUnexpectedStderr(errput) + if svntest.verify.verify_outputs( + "Output of 'svnadmin verify' is unexpected.", None, output, None, + ".*Verified revision *"): + raise svntest.Failure + +@Issues(4563) +def load_no_svndate_r0(sbox): + "load without svn:date on r0" + + sbox.build(create_wc=False, empty=True) + + # svn:date exits + svntest.actions.run_and_verify_svnlook([' svn:date\n'], [], + 'proplist', '--revprop', '-r0', + sbox.repo_dir) + + dump_old = ["SVN-fs-dump-format-version: 2\n", "\n", + "UUID: bf52886d-358d-4493-a414-944a6e5ad4f5\n", "\n", + "Revision-number: 0\n", + "Prop-content-length: 10\n", + "Content-length: 10\n", "\n", + "PROPS-END\n", "\n"] + svntest.actions.run_and_verify_load(sbox.repo_dir, dump_old) + + # svn:date should have been removed + svntest.actions.run_and_verify_svnlook([], [], + 'proplist', '--revprop', '-r0', + sbox.repo_dir) + +# This is only supported for FSFS +# The port to FSX is still pending, BDB won't support it. +@SkipUnless(svntest.main.is_fs_type_fsfs) +def hotcopy_read_only(sbox): + "'svnadmin hotcopy' a read-only source repository" + sbox.build() + svntest.main.chmod_tree(sbox.repo_dir, 0, 0222) + + backup_dir, backup_url = sbox.add_repo_path('backup') + exit_code, output, errput = svntest.main.run_svnadmin("hotcopy", + sbox.repo_dir, + backup_dir) + + # r/o repos are hard to clean up. Make it writable again. + svntest.main.chmod_tree(sbox.repo_dir, 0222, 0222) + if errput: + logger.warn("Error: hotcopy failed") + raise SVNUnexpectedStderr(errput) + +@XFail(svntest.main.is_fs_type_fsx) +@Issue(4598) +def dump_no_op_change(sbox): + "svnadmin dump with no-op changes" + + sbox.build(create_wc=False, empty=True) + empty_file = sbox.get_tempname() + svntest.main.file_write(empty_file, '') + + svntest.actions.run_and_verify_svnmucc(None, [], + '-U', sbox.repo_url, + '-m', svntest.main.make_log_msg(), + 'put', empty_file, 'bar') + # Commit a no-op change. + svntest.actions.run_and_verify_svnmucc(None, [], + '-U', sbox.repo_url, + '-m', svntest.main.make_log_msg(), + 'put', empty_file, 'bar') + # Dump and load the repository. + _, dump, _ = svntest.actions.run_and_verify_svnadmin(None, [], + 'dump', '-q', + sbox.repo_dir) + sbox2 = sbox.clone_dependent() + sbox2.build(create_wc=False, empty=True) + load_and_verify_dumpstream(sbox2, None, [], None, False, dump) + + # We expect svn log -v to yield identical results for both original and + # reconstructed repositories. This used to fail as described in the + # Issue 4598 (https://issues.apache.org/jira/browse/SVN-4598), at least + # around r1706415. + # + # Test svn log -v for r2: + _, expected, _ = svntest.actions.run_and_verify_svn(None, [], 'log', '-v', + '-r2', sbox.repo_url) + svntest.actions.run_and_verify_svn(expected, [], 'log', '-v', + '-r2', sbox2.repo_url) + # Test svn log -v for /bar: + _, expected, _ = svntest.actions.run_and_verify_svn(None, [], 'log', '-v', + sbox.repo_url + '/bar') + svntest.actions.run_and_verify_svn(expected, [], 'log', '-v', + sbox2.repo_url + '/bar') + ######################################################################## # Run the tests @@ -1916,8 +3145,27 @@ test_list = [ None, locking, mergeinfo_race, recover_old_empty, + verify_keep_going, + verify_keep_going_quiet, + verify_invalid_path_changes, + verify_denormalized_names, fsfs_recover_old_non_empty, fsfs_hotcopy_old_non_empty, + load_ignore_dates, + fsfs_hotcopy_old_with_id_changes, + verify_packed, + freeze_freeze, + verify_metadata_only, + verify_quickly, + fsfs_hotcopy_progress, + fsfs_hotcopy_progress_with_revprop_changes, + fsfs_hotcopy_progress_old, + freeze_same_uuid, + upgrade, + load_txdelta, + load_no_svndate_r0, + hotcopy_read_only, + dump_no_op_change, ] if __name__ == '__main__': |