You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2012/05/31 11:47:31 UTC
svn commit: r1344622 - in /subversion/trunk/subversion/tests/cmdline: ./
svnsync_tests_data/
Author: philip
Date: Thu May 31 09:47:31 2012
New Revision: 1344622
URL: http://svn.apache.org/viewvc?rev=1344622&view=rev
Log:
Separate the svnsync tests into those that can be run in parallel (no
authz or setlocale) and those that need to be run in serial. This
reduces the time to run the svnsync tests in parallel mode by nearly
half.
* subversion/tests/cmdline/svnsync_tests.py
(serial_only): Remove.
(basic_authz, copy_from_unreadable_dir,
copy_with_mod_from_unreadable_dir,
copy_with_mod_from_unreadable_dir_and_copy,
identity_copy, specific_deny_authz,
copy_delete_unreadable_child): Delete, now in svnsync_authz_tests.py.
* subversion/tests/cmdline/svnsync_authz_tests.py
(): New file, copied from svnsync_tests.py but only retaining some tests.
(basic_authz, copy_from_unreadable_dir,
copy_with_mod_from_unreadable_dir,
copy_with_mod_from_unreadable_dir_and_copy,
identity_copy, specific_deny_authz,
copy_delete_unreadable_child): Retained.
[ in subversion/tests/cmdline/svnsync_tests_data/ ]
* svnsync-trunk-only.dump
* svnsync-trunk-only.expected.dump
* svnsync-trunk-A-changes..dump
* svnsync-trunk-A-changes.expected.dump
Change UUID to make each test distinct and so avoid txn+UUID collisions
in the fs_fs_shared_txn_data_t code.
Added:
subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py
- copied, changed from r1344347, subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
Modified:
subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
Copied: subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py (from r1344347, subversion/trunk/subversion/tests/cmdline/svnsync_tests.py)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py?p2=subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py&p1=subversion/trunk/subversion/tests/cmdline/svnsync_tests.py&r1=1344347&r2=1344622&rev=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_authz_tests.py Thu May 31 09:47:31 2012
@@ -1,6 +1,8 @@
#!/usr/bin/env python
#
-# svnsync_tests.py: Tests SVNSync's repository mirroring capabilities.
+# svnsync_authz_tests.py: Tests SVNSync's repository mirroring
+# capabilities that need to be run serially
+# (mainly authz).
#
# Subversion is a tool for revision control.
# See http://subversion.apache.org for more information.
@@ -37,6 +39,9 @@ from svntest.verify import SVNExpectedSt
from svntest.main import write_restrictive_svnserve_conf
from svntest.main import server_has_partial_replay
+# Shared helpers
+from svnsync_tests import build_repos, run_init, run_sync, run_test
+
# (abbreviation)
Skip = svntest.testcase.Skip_deco
SkipUnless = svntest.testcase.SkipUnless_deco
@@ -46,345 +51,6 @@ Issue = svntest.testcase.Issue_deco
Wimp = svntest.testcase.Wimp_deco
Item = svntest.wc.StateItem
-######################################################################
-# Helper routines
-
-
-def build_repos(sbox):
- """Avoid the use sbox.build() because we're working with a repos
- other than the Greek tree."""
- # Cleanup after the last run by removing any left-over repository.
- svntest.main.safe_rmtree(sbox.repo_dir)
-
- # Create an empty repository.
- svntest.main.create_repos(sbox.repo_dir)
-
-
-def run_sync(url, source_url=None, expected_error=None,
- source_prop_encoding=None):
- "Synchronize the mirror repository with the master"
- if source_url is not None:
- args = ["synchronize", url, source_url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd]
- else: # Allow testing of old source-URL-less syntax
- args = ["synchronize", url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd]
- if source_prop_encoding:
- args.append("--source-prop-encoding")
- args.append(source_prop_encoding)
-
- exit_code, output, errput = svntest.main.run_svnsync(*args)
- for index, line in enumerate(errput[:]):
- if re.search("warning: W200007", line):
- del errput[index]
- if errput:
- if expected_error is None:
- raise SVNUnexpectedStderr(errput)
- else:
- expected_error = svntest.verify.RegexOutput(expected_error,
- match_all=False)
- svntest.verify.compare_and_display_lines(None, "STDERR",
- expected_error, errput)
- elif expected_error is not None:
- raise SVNExpectedStderr
- if not output and not expected_error:
- # should be: ['Committed revision 1.\n', 'Committed revision 2.\n']
- raise SVNUnexpectedStdout("Missing stdout")
-
-def run_copy_revprops(url, source_url, expected_error=None,
- source_prop_encoding=None):
- "Copy revprops to the mirror repository from the master"
- args = ["copy-revprops", url, source_url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd]
- if source_prop_encoding:
- args.append("--source-prop-encoding")
- args.append(source_prop_encoding)
-
- exit_code, output, errput = svntest.main.run_svnsync(*args)
- for index, line in enumerate(errput[:]):
- if re.search("warning: W200007", line):
- del errput[index]
- if errput:
- if expected_error is None:
- raise SVNUnexpectedStderr(errput)
- else:
- expected_error = svntest.verify.RegexOutput(expected_error,
- match_all=False)
- svntest.verify.compare_and_display_lines(None, "STDERR",
- expected_error, errput)
- elif expected_error is not None:
- raise SVNExpectedStderr
- if not output and not expected_error:
- # should be: ['Copied properties for revision 1.\n',
- # 'Copied properties for revision 2.\n']
- raise SVNUnexpectedStdout("Missing stdout")
-
-def run_init(dst_url, src_url, source_prop_encoding=None):
- "Initialize the mirror repository from the master"
- args = ["initialize", dst_url, src_url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd]
- if source_prop_encoding:
- args.append("--source-prop-encoding")
- args.append(source_prop_encoding)
-
- exit_code, output, errput = svntest.main.run_svnsync(*args)
- for index, line in enumerate(errput[:]):
- if re.search("warning: W200007", line):
- del errput[index]
- if errput:
- raise SVNUnexpectedStderr(errput)
- if output != ['Copied properties for revision 0.\n']:
- raise SVNUnexpectedStdout(output)
-
-def run_info(url, expected_error=None):
- "Print synchronization information of the repository"
- exit_code, output, errput = svntest.main.run_svnsync(
- "info", url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd)
- if errput:
- if expected_error is None:
- raise SVNUnexpectedStderr(errput)
- else:
- expected_error = svntest.verify.RegexOutput(expected_error,
- match_all=False)
- svntest.verify.compare_and_display_lines(None, "STDERR",
- expected_error, errput)
- elif expected_error is not None:
- raise SVNExpectedStderr
- if not output and not expected_error:
- # should be: ['From URL: http://....\n',
- # 'From UUID: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX\n',
- # 'Last Merged Revision: XXX\n']
- raise SVNUnexpectedStdout("Missing stdout")
-
-
-def setup_and_sync(sbox, dump_file_contents, subdir=None,
- bypass_prop_validation=False, source_prop_encoding=None,
- is_src_ra_local=None, is_dest_ra_local=None):
- """Create a repository for SBOX, load it with DUMP_FILE_CONTENTS, then create a mirror repository and sync it with SBOX. If is_src_ra_local or is_dest_ra_local is True, then run_init, run_sync, and run_copy_revprops will use the file:// scheme for the source and destination URLs. Return the mirror sandbox."""
-
- # Create the empty master repository.
- build_repos(sbox)
-
- # Load the repository from DUMP_FILE_PATH.
- svntest.actions.run_and_verify_load(sbox.repo_dir, dump_file_contents,
- bypass_prop_validation)
-
- # Create the empty destination repository.
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- # Setup the mirror repository. Feed it the UUID of the source repository.
- exit_code, output, errput = svntest.main.run_svnlook("uuid", sbox.repo_dir)
- svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
- 'setuuid', dest_sbox.repo_dir,
- output[0][:-1])
-
- # Create the revprop-change hook for this test
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- repo_url = sbox.repo_url
- cwd = os.getcwd()
- if is_src_ra_local:
- repo_url = svntest.main.file_scheme_prefix + \
- urllib.pathname2url(os.path.join(cwd, sbox.repo_dir))
-
- if subdir:
- repo_url = repo_url + subdir
-
- dest_repo_url = dest_sbox.repo_url
- if is_dest_ra_local:
- dest_repo_url = svntest.main.file_scheme_prefix + \
- urllib.pathname2url(os.path.join(cwd, dest_sbox.repo_dir))
- run_init(dest_repo_url, repo_url, source_prop_encoding)
-
- run_sync(dest_repo_url, repo_url,
- source_prop_encoding=source_prop_encoding)
- run_copy_revprops(dest_repo_url, repo_url,
- source_prop_encoding=source_prop_encoding)
-
- return dest_sbox
-
-def verify_mirror(dest_sbox, src_sbox):
- """Compare the contents of the DEST_SBOX repository with EXP_DUMP_FILE_CONTENTS."""
-
- # Remove some SVNSync-specific housekeeping properties from the
- # mirror repository in preparation for the comparison dump.
- for prop_name in ("svn:sync-from-url", "svn:sync-from-uuid",
- "svn:sync-last-merged-rev"):
- svntest.actions.run_and_verify_svn(
- None, None, [], "propdel", "--revprop", "-r", "0",
- prop_name, dest_sbox.repo_url)
-
- # Create a dump file from the mirror repository.
- dest_dump = svntest.actions.run_and_verify_dump(dest_sbox.repo_dir)
- src_dump = svntest.actions.run_and_verify_dump(src_sbox.repo_dir)
-
- svntest.verify.compare_dump_files(
- "Dump files", "DUMP", src_dump, dest_dump)
-
-def run_test(sbox, dump_file_name, subdir=None, exp_dump_file_name=None,
- bypass_prop_validation=False, source_prop_encoding=None,
- is_src_ra_local=None, is_dest_ra_local=None):
-
- """Load a dump file, sync repositories, and compare contents with the original
-or another dump file."""
-
- # This directory contains all the dump files
- svnsync_tests_dir = os.path.join(os.path.dirname(sys.argv[0]),
- 'svnsync_tests_data')
-
- # Load the specified dump file into the master repository.
- master_dumpfile_contents = open(os.path.join(svnsync_tests_dir,
- dump_file_name),
- 'rb').readlines()
-
- dest_sbox = setup_and_sync(sbox, master_dumpfile_contents, subdir,
- bypass_prop_validation, source_prop_encoding,
- is_src_ra_local, is_dest_ra_local)
-
- # Compare the dump produced by the mirror repository with either the original
- # dump file (used to create the master repository) or another specified dump
- # file.
- if exp_dump_file_name:
- build_repos(sbox)
- svntest.actions.run_and_verify_load(sbox.repo_dir,
- open(os.path.join(svnsync_tests_dir,
- exp_dump_file_name),
- 'rb').readlines())
- src_sbox = sbox
- else:
- src_sbox = sbox
-
- verify_mirror(dest_sbox, sbox)
-
-
-
-######################################################################
-# Tests
-
-#----------------------------------------------------------------------
-
-def copy_and_modify(sbox):
- "copy and modify"
- run_test(sbox, "copy-and-modify.dump")
-
-#----------------------------------------------------------------------
-
-def copy_from_previous_version_and_modify(sbox):
- "copy from previous version and modify"
- run_test(sbox, "copy-from-previous-version-and-modify.dump")
-
-#----------------------------------------------------------------------
-
-def copy_from_previous_version(sbox):
- "copy from previous version"
- run_test(sbox, "copy-from-previous-version.dump")
-
-#----------------------------------------------------------------------
-
-def modified_in_place(sbox):
- "modified in place"
- run_test(sbox, "modified-in-place.dump")
-
-#----------------------------------------------------------------------
-
-def tag_empty_trunk(sbox):
- "tag empty trunk"
- run_test(sbox, "tag-empty-trunk.dump")
-
-#----------------------------------------------------------------------
-
-def tag_trunk_with_dir(sbox):
- "tag trunk containing a sub-directory"
- run_test(sbox, "tag-trunk-with-dir.dump")
-
-#----------------------------------------------------------------------
-
-def tag_trunk_with_file(sbox):
- "tag trunk containing a file"
- run_test(sbox, "tag-trunk-with-file.dump")
-
-#----------------------------------------------------------------------
-
-def tag_trunk_with_file2(sbox):
- "tag trunk containing a file (#2)"
- run_test(sbox, "tag-trunk-with-file2.dump")
-
-#----------------------------------------------------------------------
-
-def tag_with_modified_file(sbox):
- "tag with a modified file"
- run_test(sbox, "tag-with-modified-file.dump")
-
-#----------------------------------------------------------------------
-
-def dir_prop_change(sbox):
- "directory property changes"
- run_test(sbox, "dir-prop-change.dump")
-
-#----------------------------------------------------------------------
-
-def file_dir_file(sbox):
- "files and dirs mixed together"
- run_test(sbox, "file-dir-file.dump")
-
-#----------------------------------------------------------------------
-
-def copy_parent_modify_prop(sbox):
- "copy parent and modify prop"
- run_test(sbox, "copy-parent-modify-prop.dump")
-
-#----------------------------------------------------------------------
-
-def detect_meddling(sbox):
- "detect non-svnsync commits in destination"
-
- sbox.build("svnsync-meddling")
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- # Make our own destination checkout (have to do it ourself because
- # it is not greek).
-
- svntest.main.safe_rmtree(dest_sbox.wc_dir)
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'co',
- dest_sbox.repo_url,
- dest_sbox.wc_dir)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
- run_sync(dest_sbox.repo_url)
-
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'up',
- dest_sbox.wc_dir)
-
- # Commit some change to the destination, which should be detected by svnsync
- svntest.main.file_append(os.path.join(dest_sbox.wc_dir, 'A', 'B', 'lambda'),
- 'new lambda text')
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'ci',
- '-m', 'msg',
- dest_sbox.wc_dir)
-
- run_sync(dest_sbox.repo_url, None,
- ".*Destination HEAD \\(2\\) is not the last merged revision \\(1\\).*")
-
#----------------------------------------------------------------------
@Skip(svntest.main.is_ra_type_file)
def basic_authz(sbox):
@@ -728,101 +394,6 @@ def copy_with_mod_from_unreadable_dir_an
expected_out,
out[2:12])
-def url_encoding(sbox):
- "test url encoding issues"
- run_test(sbox, "url-encoding-bug.dump")
-
-
-# A test for copying revisions that lack a property that already exists
-# on the destination rev as part of the commit (i.e. svn:author in this
-# case, but svn:date would also work).
-def no_author(sbox):
- "test copying revs with no svn:author revprops"
- run_test(sbox, "no-author.dump")
-
-def copy_revprops(sbox):
- "test copying revprops other than svn:*"
- run_test(sbox, "revprops.dump")
-
-@SkipUnless(server_has_partial_replay)
-def only_trunk(sbox):
- "test syncing subdirectories"
- run_test(sbox, "svnsync-trunk-only.dump", "/trunk",
- "svnsync-trunk-only.expected.dump")
-
-@SkipUnless(server_has_partial_replay)
-def only_trunk_A_with_changes(sbox):
- "test syncing subdirectories with changes on root"
- run_test(sbox, "svnsync-trunk-A-changes.dump", "/trunk/A",
- "svnsync-trunk-A-changes.expected.dump")
-
-# test for issue #2904
-@Issue(2904)
-def move_and_modify_in_the_same_revision(sbox):
- "test move parent and modify child file in same rev"
- run_test(sbox, "svnsync-move-and-modify.dump")
-
-def info_synchronized(sbox):
- "test info cmd on a synchronized repo"
-
- sbox.build("svnsync-info-syncd", False)
-
- # Get the UUID of the source repository.
- exit_code, output, errput = svntest.main.run_svnlook("uuid", sbox.repo_dir)
- src_uuid = output[0].strip()
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
- run_init(dest_sbox.repo_url, sbox.repo_url)
- run_sync(dest_sbox.repo_url)
-
- exit_code, output, errput = svntest.main.run_svnsync(
- "info", dest_sbox.repo_url,
- "--username", svntest.main.wc_author,
- "--password", svntest.main.wc_passwd)
- if errput:
- raise SVNUnexpectedStderr(errput)
-
- expected_out = ['Source URL: %s\n' % sbox.repo_url,
- 'Source Repository UUID: %s\n' % src_uuid,
- 'Last Merged Revision: 1\n',
- ]
-
- svntest.verify.compare_and_display_lines(None,
- 'INFO',
- expected_out,
- output)
-
-def info_not_synchronized(sbox):
- "test info cmd on an un-synchronized repo"
-
- sbox.build("svnsync-info-not-syncd", False)
-
- run_info(sbox.repo_url,
- ".*Repository '%s' is not initialized.*" % sbox.repo_url)
-
-#----------------------------------------------------------------------
-
-def copy_bad_line_endings(sbox):
- "copy with inconsistent line endings in svn:* props"
- run_test(sbox, "copy-bad-line-endings.dump",
- exp_dump_file_name="copy-bad-line-endings.expected.dump",
- bypass_prop_validation=True)
-
-def copy_bad_line_endings2(sbox):
- "copy with non-LF line endings in svn:* props"
- run_test(sbox, "copy-bad-line-endings2.dump",
- exp_dump_file_name="copy-bad-line-endings2.expected.dump",
- bypass_prop_validation=True)
-
-def copy_bad_encoding(sbox):
- "copy and reencode non-UTF-8 svn:* props"
- run_test(sbox, "copy-bad-encoding.dump",
- exp_dump_file_name="copy-bad-encoding.expected.dump",
- bypass_prop_validation=True, source_prop_encoding="ISO-8859-3")
-
def identity_copy(sbox):
"copy UTF-8 svn:* props identically"
orig_lc_all = locale.setlocale(locale.LC_ALL)
@@ -845,19 +416,6 @@ def identity_copy(sbox):
finally:
locale.setlocale(locale.LC_ALL, orig_lc_all)
-#----------------------------------------------------------------------
-
-def delete_svn_props(sbox):
- "copy with svn:* prop deletions"
- run_test(sbox, "delete-svn-props.dump")
-
-@Issue(3438)
-def commit_a_copy_of_root(sbox):
- "commit a copy of root causes sync to fail"
- #Testcase for issue 3438.
- run_test(sbox, "repo-with-copy-of-root-dir.dump")
-
-
@Skip(svntest.main.is_ra_type_file)
def specific_deny_authz(sbox):
"verify if specifically denied paths dont sync"
@@ -917,91 +475,6 @@ def specific_deny_authz(sbox):
'cat',
lambda_url)
-
-# issue #3641 'svnsync fails to partially copy a repository'.
-# This currently fails because while replacements with history
-# within copies are handled, replacements without history inside
-# copies cause the sync to fail:
-#
-# >svnsync synchronize %TEST_REPOS_ROOT_URL%/svnsync_tests-29-1
-# %TEST_REPOS_ROOT_URL%/svnsync_tests-29/trunk/H
-# Transmitting file data ...\..\..\subversion\svnsync\main.c:1444: (apr_err=160013)
-# ..\..\..\subversion\svnsync\main.c:1391: (apr_err=160013)
-# ..\..\..\subversion\libsvn_ra\ra_loader.c:1168: (apr_err=160013)
-# ..\..\..\subversion\libsvn_delta\path_driver.c:254: (apr_err=160013)
-# ..\..\..\subversion\libsvn_repos\replay.c:480: (apr_err=160013)
-# ..\..\..\subversion\libsvn_repos\replay.c:276: (apr_err=160013)
-# ..\..\..\subversion\libsvn_repos\replay.c:290: (apr_err=160013)
-# ..\..\..\subversion\libsvn_fs_base\tree.c:1258: (apr_err=160013)
-# ..\..\..\subversion\libsvn_fs_base\tree.c:1258: (apr_err=160013)
-# ..\..\..\subversion\libsvn_fs_base\tree.c:1236: (apr_err=160013)
-# ..\..\..\subversion\libsvn_fs_base\tree.c:931: (apr_err=160013)
-# ..\..\..\subversion\libsvn_fs_base\tree.c:742: (apr_err=160013)
-# svnsync: File not found: revision 4, path '/trunk/H/Z/B/lambda'
-#
-# See also http://svn.haxx.se/dev/archive-2010-11/0411.shtml and
-#
-#
-# Note: For those who may poke around this test in the future, r3 of
-# delete-revprops.dump was created with the following svnmucc command:
-#
-# svnmucc.exe -mm cp head %ROOT_URL%/trunk/A %ROOT_URL%/trunk/H
-# rm %ROOT_URL%/trunk/H/B
-# cp head %ROOT_URL%/trunk/X %ROOT_URL%/trunk/B
-#
-# r4 was created with this svnmucc command:
-#
-# svnmucc.exe -mm cp head %ROOT_URL%/trunk/A %ROOT_URL%/trunk/H/Z
-# rm %ROOT_URL%/trunk/H/Z/B
-# mkdir %ROOT_URL%/trunk/H/Z/B
-@Issue(3641)
-def descend_into_replace(sbox):
- "descending into replaced dir looks in src"
- run_test(sbox, "descend-into-replace.dump", subdir='/trunk/H',
- exp_dump_file_name = "descend-into-replace.expected.dump")
-
-# issue #3728
-@Issue(3728)
-def delete_revprops(sbox):
- "copy-revprops with removals"
- svnsync_tests_dir = os.path.join(os.path.dirname(sys.argv[0]),
- 'svnsync_tests_data')
- initial_contents = open(os.path.join(svnsync_tests_dir,
- "delete-revprops.dump"),
- 'rb').readlines()
- expected_contents = open(os.path.join(svnsync_tests_dir,
- "delete-revprops.expected.dump"),
- 'rb').readlines()
-
- # Create the initial repos and mirror, and sync 'em.
- dest_sbox = setup_and_sync(sbox, initial_contents)
-
- # Now remove a revprop from r1 of the source, and run 'svnsync
- # copy-revprops' to re-sync 'em.
- svntest.actions.enable_revprop_changes(sbox.repo_dir)
- exit_code, out, err = svntest.main.run_svn(None,
- 'pdel',
- '-r', '1',
- '--revprop',
- 'issue-id',
- sbox.repo_url)
- if err:
- raise SVNUnexpectedStderr(err)
- run_copy_revprops(dest_sbox.repo_url, sbox.repo_url)
-
- # Does the result look as we expected?
- build_repos(sbox)
- svntest.actions.run_and_verify_load(sbox.repo_dir, expected_contents)
- verify_mirror(dest_sbox, sbox)
-
-@Issue(3870)
-@SkipUnless(svntest.main.is_posix_os)
-def fd_leak_sync_from_serf_to_local(sbox):
- "fd leak during sync from serf to local"
- import resource
- resource.setrlimit(resource.RLIMIT_NOFILE, (128, 128))
- run_test(sbox, "largemods.dump", is_src_ra_local=None, is_dest_ra_local=True)
-
@Issue(4121)
@Skip(svntest.main.is_ra_type_file)
def copy_delete_unreadable_child(sbox):
@@ -1047,41 +520,12 @@ def copy_delete_unreadable_child(sbox):
# list all tests here, starting with None:
test_list = [ None,
- copy_and_modify,
- copy_from_previous_version_and_modify,
- copy_from_previous_version,
- modified_in_place,
- tag_empty_trunk,
- tag_trunk_with_dir,
- tag_trunk_with_file,
- tag_trunk_with_file2,
- tag_with_modified_file,
- dir_prop_change,
- file_dir_file,
- copy_parent_modify_prop,
- detect_meddling,
basic_authz,
copy_from_unreadable_dir,
copy_with_mod_from_unreadable_dir,
copy_with_mod_from_unreadable_dir_and_copy,
- url_encoding,
- no_author,
- copy_revprops,
- only_trunk,
- only_trunk_A_with_changes,
- move_and_modify_in_the_same_revision,
- info_synchronized,
- info_not_synchronized,
- copy_bad_line_endings,
- copy_bad_line_endings2,
- copy_bad_encoding,
identity_copy,
- delete_svn_props,
- commit_a_copy_of_root,
specific_deny_authz,
- descend_into_replace,
- delete_revprops,
- fd_leak_sync_from_serf_to_local, # calls setrlimit
copy_delete_unreadable_child,
]
serial_only = True
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests.py?rev=1344622&r1=1344621&r2=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests.py Thu May 31 09:47:31 2012
@@ -28,13 +28,12 @@
import sys, os
# Test suite-specific modules
-import locale, re, urllib
+import re, urllib
# Our testing module
import svntest
from svntest.verify import SVNUnexpectedStdout, SVNUnexpectedStderr
from svntest.verify import SVNExpectedStderr
-from svntest.main import write_restrictive_svnserve_conf
from svntest.main import server_has_partial_replay
# (abbreviation)
@@ -385,349 +384,6 @@ def detect_meddling(sbox):
run_sync(dest_sbox.repo_url, None,
".*Destination HEAD \\(2\\) is not the last merged revision \\(1\\).*")
-#----------------------------------------------------------------------
-@Skip(svntest.main.is_ra_type_file)
-def basic_authz(sbox):
- "verify that unreadable content is not synced"
-
- sbox.build("svnsync-basic-authz")
-
- write_restrictive_svnserve_conf(sbox.repo_dir)
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
-
- args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
- svntest.main.file_write(sbox.authz_file,
- "[%s:/]\n"
- "* = r\n"
- "\n"
- "[%s:/A/B]\n"
- "* = \n"
- "\n"
- "[%s:/]\n"
- "* = rw\n" % args)
-
- run_sync(dest_sbox.repo_url)
-
- lambda_url = dest_sbox.repo_url + '/A/B/lambda'
- iota_url = dest_sbox.repo_url + '/iota'
-
- # this file should have been blocked by authz
- svntest.actions.run_and_verify_svn(None,
- [], svntest.verify.AnyOutput,
- 'cat',
- lambda_url)
- # this file should have been synced
- svntest.actions.run_and_verify_svn(None,
- svntest.verify.AnyOutput, [],
- 'cat',
- iota_url)
-
-#----------------------------------------------------------------------
-@Skip(svntest.main.is_ra_type_file)
-def copy_from_unreadable_dir(sbox):
- "verify that copies from unreadable dirs work"
-
- sbox.build("svnsync-copy-from-unreadable-dir")
-
- B_url = sbox.repo_url + '/A/B'
- P_url = sbox.repo_url + '/A/P'
-
- # Set a property on the directory we're going to copy, and a file in it, to
- # confirm that they're transmitted when we later sync the copied directory
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'pset',
- 'foo',
- 'bar',
- sbox.wc_dir + '/A/B/lambda')
-
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'pset',
- 'baz',
- 'zot',
- sbox.wc_dir + '/A/B')
-
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'ci',
- sbox.wc_dir + '/A/B',
- '-m', 'log_msg')
-
- # Now copy that directory so we'll see it in our synced copy
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'cp',
- B_url,
- P_url,
- '-m', 'Copy B to P')
-
- write_restrictive_svnserve_conf(sbox.repo_dir)
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
- open(sbox.authz_file, 'w').write(
- "[%s:/]\n"
- "* = r\n"
- "\n"
- "[%s:/A/B]\n"
- "* = \n"
- "\n"
- "[%s:/]\n"
- "* = rw"
- % args)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
-
- run_sync(dest_sbox.repo_url)
-
- expected_out = [
- 'Changed paths:\n',
- ' A /A/P\n',
- ' A /A/P/E\n',
- ' A /A/P/E/alpha\n',
- ' A /A/P/E/beta\n',
- ' A /A/P/F\n',
- ' A /A/P/lambda\n',
- '\n',
- '\n', # log message is stripped
- ]
-
- exit_code, out, err = svntest.main.run_svn(None,
- 'log',
- '-r', '3',
- '-v',
- dest_sbox.repo_url)
-
- if err:
- raise SVNUnexpectedStderr(err)
-
- svntest.verify.compare_and_display_lines(None,
- 'LOG',
- expected_out,
- out[2:11])
-
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
- [],
- 'pget',
- 'foo',
- dest_sbox.repo_url + '/A/P/lambda')
-
- svntest.actions.run_and_verify_svn(None,
- ['zot\n'],
- [],
- 'pget',
- 'baz',
- dest_sbox.repo_url + '/A/P')
-
-# Issue 2705.
-@Issue(2705)
-@Skip(svntest.main.is_ra_type_file)
-def copy_with_mod_from_unreadable_dir(sbox):
- "verify copies with mods from unreadable dirs"
-
- sbox.build("svnsync-copy-with-mod-from-unreadable-dir")
-
- # Make a copy of the B directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'cp',
- sbox.wc_dir + '/A/B',
- sbox.wc_dir + '/A/P')
-
- # Set a property inside the copied directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'pset',
- 'foo',
- 'bar',
- sbox.wc_dir + '/A/P/lambda')
-
- # Add a new directory and file inside the copied directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'mkdir',
- sbox.wc_dir + '/A/P/NEW-DIR')
-
- svntest.main.file_append(sbox.wc_dir + '/A/P/E/new-file', "bla bla")
- svntest.main.run_svn(None, 'add', sbox.wc_dir + '/A/P/E/new-file')
-
- # Delete a file inside the copied directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'rm',
- sbox.wc_dir + '/A/P/E/beta')
-
- # Commit the copy-with-modification.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'ci',
- sbox.wc_dir,
- '-m', 'log_msg')
-
- # Lock down the source repository.
- write_restrictive_svnserve_conf(sbox.repo_dir)
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
- open(sbox.authz_file, 'w').write(
- "[%s:/]\n"
- "* = r\n"
- "\n"
- "[%s:/A/B]\n"
- "* = \n"
- "\n"
- "[%s:/]\n"
- "* = rw"
- % args)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
-
- run_sync(dest_sbox.repo_url)
-
- expected_out = [
- 'Changed paths:\n',
- ' A /A/P\n',
- ' A /A/P/E\n',
- ' A /A/P/E/alpha\n',
- ' A /A/P/E/new-file\n',
- ' A /A/P/F\n',
- ' A /A/P/NEW-DIR\n',
- ' A /A/P/lambda\n',
- '\n',
- '\n', # log message is stripped
- ]
-
- exit_code, out, err = svntest.main.run_svn(None,
- 'log',
- '-r', '2',
- '-v',
- dest_sbox.repo_url)
-
- if err:
- raise SVNUnexpectedStderr(err)
-
- svntest.verify.compare_and_display_lines(None,
- 'LOG',
- expected_out,
- out[2:12])
-
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
- [],
- 'pget',
- 'foo',
- dest_sbox.repo_url + '/A/P/lambda')
-
-# Issue 2705.
-@Issue(2705)
-@Skip(svntest.main.is_ra_type_file)
-def copy_with_mod_from_unreadable_dir_and_copy(sbox):
- "verify copies with mods from unreadable dirs +copy"
-
- sbox.build("svnsync-copy-with-mod-from-unreadable-dir-and-copy")
-
- # Make a copy of the B directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'cp',
- sbox.wc_dir + '/A/B',
- sbox.wc_dir + '/A/P')
-
-
- # Copy a (readable) file into the copied directory.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'cp',
- sbox.wc_dir + '/A/D/gamma',
- sbox.wc_dir + '/A/P/E')
-
-
- # Commit the copy-with-modification.
- svntest.actions.run_and_verify_svn(None,
- None,
- [],
- 'ci',
- sbox.wc_dir,
- '-m', 'log_msg')
-
- # Lock down the source repository.
- write_restrictive_svnserve_conf(sbox.repo_dir)
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- args = tuple(s.authz_name() for s in [sbox, sbox, dest_sbox])
- open(sbox.authz_file, 'w').write(
- "[%s:/]\n"
- "* = r\n"
- "\n"
- "[%s:/A/B]\n"
- "* = \n"
- "\n"
- "[%s:/]\n"
- "* = rw"
- % args)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
-
- run_sync(dest_sbox.repo_url)
-
- expected_out = [
- 'Changed paths:\n',
- ' A /A/P\n',
- ' A /A/P/E\n',
- ' A /A/P/E/alpha\n',
- ' A /A/P/E/beta\n',
- ' A /A/P/E/gamma (from /A/D/gamma:1)\n',
- ' A /A/P/F\n',
- ' A /A/P/lambda\n',
- '\n',
- '\n', # log message is stripped
- ]
-
- exit_code, out, err = svntest.main.run_svn(None,
- 'log',
- '-r', '2',
- '-v',
- dest_sbox.repo_url)
-
- if err:
- raise SVNUnexpectedStderr(err)
-
- svntest.verify.compare_and_display_lines(None,
- 'LOG',
- expected_out,
- out[2:12])
-
def url_encoding(sbox):
"test url encoding issues"
run_test(sbox, "url-encoding-bug.dump")
@@ -823,28 +479,6 @@ def copy_bad_encoding(sbox):
exp_dump_file_name="copy-bad-encoding.expected.dump",
bypass_prop_validation=True, source_prop_encoding="ISO-8859-3")
-def identity_copy(sbox):
- "copy UTF-8 svn:* props identically"
- orig_lc_all = locale.setlocale(locale.LC_ALL)
- other_locales = [ "English.1252", "German.1252", "French.1252",
- "en_US.ISO-8859-1", "en_GB.ISO-8859-1", "de_DE.ISO-8859-1",
- "en_US.ISO8859-1", "en_GB.ISO8859-1", "de_DE.ISO8859-1" ]
- for other_locale in other_locales:
- try:
- locale.setlocale(locale.LC_ALL, other_locale)
- break
- except:
- pass
- if locale.setlocale(locale.LC_ALL) != other_locale:
- raise svntest.Skip
-
- try:
- run_test(sbox, "copy-bad-encoding.expected.dump",
- exp_dump_file_name="copy-bad-encoding.expected.dump",
- bypass_prop_validation=True)
- finally:
- locale.setlocale(locale.LC_ALL, orig_lc_all)
-
#----------------------------------------------------------------------
def delete_svn_props(sbox):
@@ -858,66 +492,6 @@ def commit_a_copy_of_root(sbox):
run_test(sbox, "repo-with-copy-of-root-dir.dump")
-@Skip(svntest.main.is_ra_type_file)
-def specific_deny_authz(sbox):
- "verify if specifically denied paths dont sync"
-
- sbox.build("specific-deny-authz")
-
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
-
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- run_init(dest_sbox.repo_url, sbox.repo_url)
-
- svntest.main.run_svn(None, "cp",
- os.path.join(sbox.wc_dir, "A"),
- os.path.join(sbox.wc_dir, "A_COPY")
- )
- svntest.main.run_svn(None, "ci", "-mm", sbox.wc_dir)
-
- write_restrictive_svnserve_conf(sbox.repo_dir)
-
- # For mod_dav_svn's parent path setup we need per-repos permissions in
- # the authz file...
- if sbox.repo_url.startswith('http'):
- svntest.main.file_write(sbox.authz_file,
- "[specific-deny-authz:/]\n"
- "* = r\n"
- "\n"
- "[specific-deny-authz:/A]\n"
- "* = \n"
- "\n"
- "[specific-deny-authz:/A_COPY/B/lambda]\n"
- "* = \n"
- "\n"
- "[specific-deny-authz-1:/]\n"
- "* = rw\n")
- # Otherwise we can just go with the permissions needed for the source
- # repository.
- else:
- svntest.main.file_write(sbox.authz_file,
- "[/]\n"
- "* = r\n"
- "\n"
- "[/A]\n"
- "* = \n"
- "\n"
- "[/A_COPY/B/lambda]\n"
- "* = \n")
-
- run_sync(dest_sbox.repo_url)
-
- lambda_url = dest_sbox.repo_url + '/A_COPY/B/lambda'
-
- # this file should have been blocked by authz
- svntest.actions.run_and_verify_svn(None,
- [], svntest.verify.AnyOutput,
- 'cat',
- lambda_url)
-
-
# issue #3641 'svnsync fails to partially copy a repository'.
# This currently fails because while replacements with history
# within copies are handled, replacements without history inside
@@ -1002,44 +576,6 @@ def fd_leak_sync_from_serf_to_local(sbox
resource.setrlimit(resource.RLIMIT_NOFILE, (128, 128))
run_test(sbox, "largemods.dump", is_src_ra_local=None, is_dest_ra_local=True)
-@Issue(4121)
-@Skip(svntest.main.is_ra_type_file)
-def copy_delete_unreadable_child(sbox):
- "copy, then rm at-src-unreadable child"
-
- # Prepare the source: Greek tree (r1), cp+rm (r2).
- sbox.build("copy-delete-unreadable-child")
- svntest.actions.run_and_verify_svnmucc(None, None, [],
- '-m', 'r2',
- '-U', sbox.repo_url,
- 'cp', 'HEAD', '/', 'branch',
- 'rm', 'branch/A')
-
- # Create the destination.
- dest_sbox = sbox.clone_dependent()
- build_repos(dest_sbox)
- svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
-
- # Lock down the source.
- authz = sbox.authz_name()
- write_restrictive_svnserve_conf(sbox.repo_dir, anon_access='read')
- svntest.main.file_write(sbox.authz_file,
- "[%s:/]\n"
- "* = r\n"
- "[%s:/A]\n"
- "* = \n"
- % (authz, authz))
-
- dest_url = svntest.main.file_scheme_prefix \
- + urllib.pathname2url(os.path.abspath(dest_sbox.repo_dir))
- run_init(dest_url, sbox.repo_url)
- run_sync(dest_url)
-
- # sanity check
- svntest.actions.run_and_verify_svn(None,
- ["iota\n"], [],
- 'ls', dest_url+'/branch@2')
-
########################################################################
# Run the tests
@@ -1060,10 +596,6 @@ test_list = [ None,
file_dir_file,
copy_parent_modify_prop,
detect_meddling,
- basic_authz,
- copy_from_unreadable_dir,
- copy_with_mod_from_unreadable_dir,
- copy_with_mod_from_unreadable_dir_and_copy,
url_encoding,
no_author,
copy_revprops,
@@ -1075,19 +607,15 @@ test_list = [ None,
copy_bad_line_endings,
copy_bad_line_endings2,
copy_bad_encoding,
- identity_copy,
delete_svn_props,
commit_a_copy_of_root,
- specific_deny_authz,
descend_into_replace,
delete_revprops,
fd_leak_sync_from_serf_to_local, # calls setrlimit
- copy_delete_unreadable_child,
]
-serial_only = True
if __name__ == '__main__':
- svntest.main.run_tests(test_list, serial_only = serial_only)
+ svntest.main.run_tests(test_list)
# NOTREACHED
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump?rev=1344622&r1=1344621&r2=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump Thu May 31 09:47:31 2012
@@ -1,6 +1,6 @@
SVN-fs-dump-format-version: 2
-UUID: 728f5e1e-a57c-4dd4-8b4f-ca752f5178f3
+UUID: 11659000-ab01-11e1-8800-0080c8fbf679
Revision-number: 0
Prop-content-length: 56
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump?rev=1344622&r1=1344621&r2=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump Thu May 31 09:47:31 2012
@@ -1,6 +1,6 @@
SVN-fs-dump-format-version: 2
-UUID: 728f5e1e-a57c-4dd4-8b4f-ca752f5178f3
+UUID: 11659000-ab01-11e1-8800-0080c8fbf679
Revision-number: 0
Prop-content-length: 56
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump?rev=1344622&r1=1344621&r2=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump Thu May 31 09:47:31 2012
@@ -1,6 +1,6 @@
SVN-fs-dump-format-version: 2
-UUID: 728f5e1e-a57c-4dd4-8b4f-ca752f5178f3
+UUID: a6952d52-ab01-11e1-b37f-0080c8fbf679
Revision-number: 0
Prop-content-length: 56
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump?rev=1344622&r1=1344621&r2=1344622&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump Thu May 31 09:47:31 2012
@@ -1,6 +1,6 @@
SVN-fs-dump-format-version: 2
-UUID: 728f5e1e-a57c-4dd4-8b4f-ca752f5178f3
+UUID: a6952d52-ab01-11e1-b37f-0080c8fbf679
Revision-number: 0
Prop-content-length: 56