Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests.py (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests.py Thu Jun 7 12:57:43 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/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.dump Thu Jun 7 12:57:43 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/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-A-changes.expected.dump Thu Jun 7 12:57:43 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/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.dump Thu Jun 7 12:57:43 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/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svnsync_tests_data/svnsync-trunk-only.expected.dump Thu Jun 7 12:57:43 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/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/actions.py Thu Jun 7 12:57:43 2012 @@ -1868,7 +1868,8 @@ def enable_revprop_changes(repo_dir): pre-revprop-change hook script and (if appropriate) making it executable.""" hook_path = main.get_pre_revprop_change_hook_path(repo_dir) - main.create_python_hook_script(hook_path, 'import sys; sys.exit(0)') + main.create_python_hook_script(hook_path, 'import sys; sys.exit(0)', + cmd_alternative='@exit /b 0') def disable_revprop_changes(repo_dir): """Disable revprop changes in the repository at REPO_DIR by creating a @@ -1878,8 +1879,12 @@ def disable_revprop_changes(repo_dir): hook_path = main.get_pre_revprop_change_hook_path(repo_dir) main.create_python_hook_script(hook_path, 'import sys\n' - 'sys.stderr.write("pre-revprop-change %s" % " ".join(sys.argv[1:6]))\n' - 'sys.exit(1)\n') + 'sys.stderr.write("pre-revprop-change %s" %' + ' " ".join(sys.argv[1:]))\n' + 'sys.exit(1)\n', + cmd_alternative= + '@echo pre-revprop-change %* 1>&2\n' + '@exit /b 1\n') def create_failing_post_commit_hook(repo_dir): """Create a post-commit hook script in the repository at REPO_DIR that always @@ -1888,7 +1893,10 @@ def create_failing_post_commit_hook(repo hook_path = main.get_post_commit_hook_path(repo_dir) main.create_python_hook_script(hook_path, 'import sys\n' 'sys.stderr.write("Post-commit hook failed")\n' - 'sys.exit(1)') + 'sys.exit(1)\n', + cmd_alternative= + '@echo Post-commit hook failed 1>&2\n' + '@exit /b 1\n') # set_prop can be used for properties with NULL characters which are not # handled correctly when passed to subprocess.Popen() and values like "*" Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/svntest/main.py Thu Jun 7 12:57:43 2012 @@ -934,18 +934,23 @@ def canonicalize_url(input): return input -def create_python_hook_script(hook_path, hook_script_code): +def create_python_hook_script(hook_path, hook_script_code, + cmd_alternative=None): """Create a Python hook script at HOOK_PATH with the specified HOOK_SCRIPT_CODE.""" if windows: - # Use an absolute path since the working directory is not guaranteed - hook_path = os.path.abspath(hook_path) - # Fill the python file. - file_write("%s.py" % hook_path, hook_script_code) - # Fill the batch wrapper file. - file_append("%s.bat" % hook_path, - "@\"%s\" %s.py %%*\n" % (sys.executable, hook_path)) + if cmd_alternative is not None: + file_write("%s.bat" % hook_path, + cmd_alternative) + else: + # Use an absolute path since the working directory is not guaranteed + hook_path = os.path.abspath(hook_path) + # Fill the python file. + file_write("%s.py" % hook_path, hook_script_code) + # Fill the batch wrapper file. + file_write("%s.bat" % hook_path, + "@\"%s\" %s.py %%*\n" % (sys.executable, hook_path)) else: # For all other platforms file_write(hook_path, "#!%s\n%s" % (sys.executable, hook_script_code)) Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py Thu Jun 7 12:57:43 2012 @@ -5793,6 +5793,62 @@ def update_nested_move_text_mod(sbox): None, None, None, None, None, 1) +def update_with_parents_and_exclude(sbox): + "bring a subtree in over an excluded path" + + sbox.build(read_only = True) + wc_dir = sbox.wc_dir + + # Now we are going to exclude A + expected_output = svntest.wc.State(wc_dir, { + 'A' : Item(status='D '), + }) + + expected_status = svntest.wc.State(wc_dir, { + '' : Item(status=' ', wc_rev='1'), + 'iota' : Item(status=' ', wc_rev='1'), + }) + + svntest.actions.run_and_verify_update(wc_dir, + expected_output, + None, + expected_status, + None, None, None, + None, None, False, + '--set-depth', 'exclude', + sbox.ospath('A')) + + expected_output = svntest.wc.State(wc_dir, { + 'A' : Item(status='A '), + 'A/B' : Item(status='A '), + 'A/B/F' : Item(status='A '), + 'A/B/E' : Item(status='A '), + 'A/B/E/beta' : Item(status='A '), + 'A/B/E/alpha' : Item(status='A '), + 'A/B/lambda' : Item(status='A '), + }) + + expected_status = svntest.wc.State(wc_dir, { + '' : Item(status=' ', wc_rev='1'), + 'A' : Item(status=' ', wc_rev='1'), + 'A/B' : Item(status=' ', wc_rev='1'), + 'A/B/F' : Item(status=' ', wc_rev='1'), + 'A/B/E' : Item(status=' ', wc_rev='1'), + 'A/B/E/beta' : Item(status=' ', wc_rev='1'), + 'A/B/E/alpha' : Item(status=' ', wc_rev='1'), + 'A/B/lambda' : Item(status=' ', wc_rev='1'), + 'iota' : Item(status=' ', wc_rev='1'), + }) + + svntest.actions.run_and_verify_update(wc_dir, + expected_output, + None, + expected_status, + None, None, None, + None, None, False, + '--parents', + sbox.ospath('A/B')) + ####################################################################### # Run the tests @@ -5868,6 +5924,7 @@ test_list = [ None, update_binary_file_3, update_move_text_mod, update_nested_move_text_mod, + update_with_parents_and_exclude, ] if __name__ == '__main__': Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_client/client-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_client/client-test.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_client/client-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_client/client-test.c Thu Jun 7 12:57:43 2012 @@ -689,7 +689,7 @@ test_youngest_common_ancestor(const svn_ repos_url, repos_uuid, 2, "iota", pool), svn_client__pathrev_create_with_relpath( repos_url, repos_uuid, 2, "A/iota", pool), - ctx, pool, pool)); + NULL, ctx, pool, pool)); SVN_TEST_STRING_ASSERT(svn_client__pathrev_relpath(yc_ancestor, pool), "iota"); SVN_TEST_ASSERT(yc_ancestor->rev == 1); @@ -713,7 +713,7 @@ test_youngest_common_ancestor(const svn_ repos_url, repos_uuid, 0, "", pool), svn_client__pathrev_create_with_relpath( repos_url, repos_uuid, 3, "A/ROOT", pool), - ctx, pool, pool)); + NULL, ctx, pool, pool)); SVN_TEST_STRING_ASSERT(svn_client__pathrev_relpath(yc_ancestor, pool), ""); SVN_TEST_ASSERT(yc_ancestor->rev == 0); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c Thu Jun 7 12:57:43 2012 @@ -189,7 +189,7 @@ generate_random_file(apr_uint32_t maxlen { const int ch = (random_bytes ? (unsigned)random_bytes[r % bytes_range] - : r % bytes_range); + : (int)(r % bytes_range)); if (buf == end) { apr_size_t ignore_length; Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Jun 7 12:57:43 2012 @@ -882,6 +882,8 @@ static const testcase_canonicalize_t uri { "https://SERVER:80/";, "https://server:80"; }, { "svn://server:80", "svn://server:80" }, { "svn://SERVER:443/", "svn://server:443" }, + { "file:///C%7C/temp/REPOS", "file:///C%7C/temp/REPOS" }, + { "file:///C|/temp/REPOS", "file:///C%7C/temp/REPOS" }, #ifdef SVN_USE_DOS_PATHS { "file:///c:/temp/repos", "file:///C:/temp/repos" }, { "file:///c:/temp/REPOS", "file:///C:/temp/REPOS" }, Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_wc/utils.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_wc/utils.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_wc/utils.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_wc/utils.c Thu Jun 7 12:57:43 2012 @@ -81,17 +81,18 @@ create_repos_and_wc(const char **repos_u /* Create a WC. Set *WC_ABSPATH to its path. */ { + apr_pool_t *subpool = svn_pool_create(pool); /* To cleanup CTX */ svn_client_ctx_t *ctx; svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} }; - SVN_ERR(svn_client_create_context(&ctx, pool)); - /* SVN_ERR(svn_config_get_config(&ctx->config, config_dir, pool)); */ + SVN_ERR(svn_client_create_context(&ctx, subpool)); SVN_ERR(svn_dirent_get_absolute(wc_abspath, wc_path, pool)); SVN_ERR(svn_client_checkout3(NULL, *repos_url, *wc_abspath, &head_rev, &head_rev, svn_depth_infinity, FALSE /* ignore_externals */, FALSE /* allow_unver_obstructions */, - ctx, pool)); + ctx, subpool)); + svn_pool_destroy(subpool); } /* Register this WC for cleanup. */ Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_wc/wc-queries-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_wc/wc-queries-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_wc/wc-queries-test.c Thu Jun 7 12:57:43 2012 @@ -80,33 +80,23 @@ static const int schema_statements[] = static const int slow_statements[] = { /* Operate on the entire WC */ - STMT_HAS_SWITCHED_WCROOT, - STMT_HAS_SWITCHED_WCROOT_REPOS_ROOT, - STMT_SELECT_ALL_NODES, + STMT_HAS_SWITCHED_WCROOT, /* wc scan op_depth 0 */ + STMT_HAS_SWITCHED_WCROOT_REPOS_ROOT, /* wc scan op_depth 0 */ + STMT_SELECT_ALL_NODES, /* schema validation code */ - /* Is there a record? */ + /* Is there a record? ### Can we somehow check for LIMIT 1? */ STMT_LOOK_FOR_WORK, STMT_HAS_WORKING_NODES, - /* Need review: */ - STMT_DELETE_ACTUAL_EMPTIES, - - /* Upgrade statements? */ - STMT_SELECT_OLD_TREE_CONFLICT, - STMT_ERASE_OLD_CONFLICTS, - STMT_SELECT_ALL_FILES, - STMT_HAS_ACTUAL_NODES_CONFLICTS, - /* Need index? */ - STMT_SELECT_TARGETS, - STMT_INSERT_ACTUAL_EMPTIES, STMT_SELECT_PRISTINE_BY_MD5, /* Only used by deprecated api */ - STMT_SELECT_DELETE_LIST, - /* Create temporary table */ + /* Full temporary table read */ + STMT_INSERT_ACTUAL_EMPTIES, STMT_SELECT_REVERT_LIST_RECURSIVE, + STMT_SELECT_DELETE_LIST, - /* Designed as slow */ + /* Designed as slow to avoid penalty on other queries */ STMT_SELECT_UNREFERENCED_PRISTINES, /* Slow, but just if foreign keys are enabled: Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnbuild.sh?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnbuild.sh (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnbuild.sh Thu Jun 7 12:57:43 2012 @@ -22,5 +22,7 @@ set -e set -x +export JAVA_HOME=/usr/local/jdk-1.7.0 + branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" (cd .. && gmake BRANCH="$branch" THREADING="no") Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/centos/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/centos/svnbuild.sh?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/centos/svnbuild.sh (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/centos/svnbuild.sh Thu Jun 7 12:57:43 2012 @@ -34,6 +34,7 @@ echo "========= configure" # --without-berkeley-db \ ./configure --enable-javahl --enable-maintainer-mode \ --with-neon=/usr \ + --with-serf=/usr/local \ --with-apxs=/usr/sbin/apxs \ --with-berkeley-db \ --with-apr=/usr \ Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Thu Jun 7 12:57:43 2012 @@ -77,21 +77,21 @@ IF "%LOCAL%+%FSFS%" == "1+1" ( IF "%SVN%+%FSFS%" == "1+1" ( taskkill /im svnserve.exe /f 2> nul: - echo win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://localhost %ARGS% "%TESTDIR%\tests" - win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://localhost %ARGS% "%TESTDIR%\tests" + echo win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests" + win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests" IF ERRORLEVEL 1 EXIT /B 1 ) IF "%SERF%+%FSFS%" == "1+1" ( taskkill /im httpd.exe /f 2> nul: - echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests" - win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests" + echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" + win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" IF ERRORLEVEL 1 EXIT /B 1 ) IF "%NEON%+%FSFS%" == "1+1" ( taskkill /im httpd.exe /f 2> nul: - echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests" - win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://localhost:%TESTPORT% %ARGS% "%TESTDIR%\tests" + echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" + win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" IF ERRORLEVEL 1 EXIT /B 1 ) Propchange: subversion/branches/javahl-ra/tools/client-side/mergeinfo-sanitizer.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/__init__.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/dev/histogram.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/javahl-ra/tools/dev/mergegraph/mergegraph.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/mergegraph/mergegraph.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/mergegraph/mergegraph.py (original) +++ subversion/branches/javahl-ra/tools/dev/mergegraph/mergegraph.py Thu Jun 7 12:57:43 2012 @@ -65,7 +65,8 @@ from pydot import Node, Edge def mergeinfo_to_node_list(mi): """Convert a mergeinfo string such as '/foo:1,3-5*' into a list of - node names such as ['foo1', 'foo3', 'foo4', 'foo5'].""" + node names such as ['foo1', 'foo3', 'foo4', 'foo5']. + """ ### Doesn't yet strip the leading slash. l = [] if mi: @@ -89,7 +90,8 @@ def mergeinfo_to_node_list(mi): class MergeGraph(pydot.Graph): """Base class, not intended for direct use. Use MergeDot for the main - graph and MergeSubgraph for a subgraph.""" + graph and MergeSubgraph for a subgraph. + """ def mk_origin_node(graph, name, label): """Add a node to the graph""" @@ -169,13 +171,15 @@ class MergeGraph(pydot.Graph): def add_annotation(graph, node, label, color='lightblue'): """Add a graph node that serves as an annotation to a normal node. - More than one annotation can be added to the same normal node.""" + More than one annotation can be added to the same normal node. + """ subg_name = node + '_annotations' def get_subgraph(graph, name): """Equivalent to pydot.Graph.get_subgraph() when there is no more than one subgraph of the given name, but working aroung a bug in - pydot.Graph.get_subgraph().""" + pydot.Graph.get_subgraph(). + """ for subg in graph.get_subgraph_list(): if subg.get_name() == name: return subg @@ -298,7 +302,12 @@ class MergeDot(MergeGraph, pydot.Dot): """Save this merge graph to the given file format. If filename is None, construct a filename from the basename of the original file (as passed to the constructor and then stored in graph.basename) and the suffix - according to the given format.""" + according to the given format. + """ if not filename: filename = graph.basename + '.' + format - pydot.Dot.write(graph, filename, format=format) + if format == 'sh': + import save_as_sh + save_as_sh.write_sh_file(graph, filename) + else: + pydot.Dot.write(graph, filename, format=format) Propchange: subversion/branches/javahl-ra/tools/dev/sbox-ospath.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn Thu Jun 7 12:57:43 2012 @@ -31,7 +31,11 @@ ENABLE_PERL_BINDINGS ?= yes THREADING ?= yes -ENABLE_JAVA_BINDINGS ?= no # they don't build with thread-less APR... +ifeq ($(THREADING),yes) +ENABLE_JAVA_BINDINGS ?= yes +else +ENABLE_JAVA_BINDINGS ?= no +endif USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv PARALLEL ?= 1 CLEANUP ?= 1 @@ -75,6 +79,7 @@ LIBMAGIC_VER = 5.11 RUBY_VER = 1.8.7-p358 BZ2_VER = 1.0.6 PYTHON_VER = 2.7.3 +JUNIT_VER = 4.10 BDB_DIST = db-$(BDB_VER).tar.gz APR_ICONV_DIST = apr-iconv-$(APR_ICONV_VER).tar.gz @@ -87,6 +92,7 @@ LIBMAGIC_DIST = file-$(LIBMAGIC_VER).tar RUBY_DIST = ruby-$(RUBY_VER).tar.gz BZ2_DIST = bzip2-$(BZ2_VER).tar.gz PYTHON_DIST = Python-$(PYTHON_VER).tgz +JUNIT_DIST = junit-${JUNIT_VER}.jar DISTFILES = $(DISTDIR)/$(NEON_DIST) \ $(DISTDIR)/$(SERF_DIST) \ @@ -98,7 +104,8 @@ DISTFILES = $(DISTDIR)/$(NEON_DIST) \ $(DISTDIR)/$(LIBMAGIC_DIST) \ $(DISTDIR)/$(RUBY_DIST) \ $(DISTDIR)/$(BZ2_DIST) \ - $(DISTDIR)/$(PYTHON_DIST) + $(DISTDIR)/$(PYTHON_DIST) \ + $(DISTDIR)/$(JUNIT_DIST) FETCH_CMD = wget -c @@ -119,6 +126,8 @@ LIBMAGIC_URL = ftp://ftp.astron.com/pub/ RUBY_URL = http://ftp.ruby-lang.org/pub/ruby/1.8/$(RUBY_DIST) BZ2_URL = http://bzip.org/$(BZ2_VER)/$(BZ2_DIST) PYTHON_URL = http://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST) +JUNIT_URL = http://cloud.github.com/downloads/KentBeck/junit/$(JUNIT_DIST) + BDB_SRCDIR = $(SRCDIR)/db-$(BDB_VER) APR_SRCDIR = $(SRCDIR)/apr-$(APR_VER) @@ -1072,6 +1081,14 @@ $(PYTHON_OBJDIR)/.installed: $(PYTHON_OB ####################################################################### +# junit +####################################################################### + +# fetch distfile for junit +$(DISTDIR)/$(JUNIT_DIST): + cd $(DISTDIR) && $(FETCH_CMD) $(JUNIT_URL) + +####################################################################### # svn ####################################################################### @@ -1168,7 +1185,7 @@ endif ifeq ($(ENABLE_JAVA_BINDINGS),yes) JAVAHL_FLAG=--enable-javahl=yes --with-jdk --with-jikes=no \ - --with-junit=$(PWD)/junit.jar + --with-junit=$(DISTDIR)/$(JUNIT_DIST) else JAVAHL_FLAG=--enable-javahl=no endif @@ -1182,13 +1199,7 @@ SVN_WITH_SASL=--with-sasl="$(PREFIX)/cyr endif # configure svn -$(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved - @if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ - if [ ! -e $(PWD)/junit.jar ]; then \ - echo "Please provide $(PWD)/junit.jar"; \ - exit 1; \ - fi; \ - fi +$(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) cd $(SVN_SRCDIR) && ./autogen.sh cd $(svn_builddir) && \ env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib" \ Modified: subversion/branches/javahl-ra/tools/server-side/svnauthz-validate.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/server-side/svnauthz-validate.c?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/server-side/svnauthz-validate.c (original) +++ subversion/branches/javahl-ra/tools/server-side/svnauthz-validate.c Thu Jun 7 12:57:43 2012 @@ -94,6 +94,7 @@ main(int argc, const char **argv) if (err) { svn_handle_error2(err, stderr, FALSE, "svnauthz-validate: "); + svn_error_clear(err); return 1; } else Propchange: subversion/branches/javahl-ra/tools/server-side/svnpredumpfilter.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/commit-hook.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/daemonize.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnpubsub/__init__.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnpubsub/client.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnpubsub/server.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svntweet.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/svnwcsub.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/testserver.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: subversion/branches/javahl-ra/tools/server-side/svnpubsub/watcher.py ------------------------------------------------------------------------------ svn:eol-style = native Modified: subversion/branches/javahl-ra/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/win-tests.py?rev=1347595&r1=1347594&r2=1347595&view=diff ============================================================================== --- subversion/branches/javahl-ra/win-tests.py (original) +++ subversion/branches/javahl-ra/win-tests.py Thu Jun 7 12:57:43 2012 @@ -534,6 +534,12 @@ class Httpd: fp.write(self._svn_module('dav_svn_module', 'mod_dav_svn.so')) fp.write(self._svn_module('authz_svn_module', 'mod_authz_svn.so')) + # Don't handle .htaccess, symlinks, etc. + fp.write('<Directory />\n') + fp.write('AllowOverride None\n') + fp.write('Options None\n') + fp.write('</Directory>\n\n') + # Define two locations for repositories fp.write(self._svn_repo('repositories')) fp.write(self._svn_repo('local_tmp')) @@ -562,9 +568,10 @@ class Httpd: def _create_users_file(self): "Create users file" htpasswd = os.path.join(self.httpd_dir, 'bin', 'htpasswd.exe') - os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mbc', self.httpd_users, + # Create the cheapest to compare password form for our testsuite + os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bcp', self.httpd_users, 'jrandom', 'rayjandom']) - os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mb', self.httpd_users, + os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bp', self.httpd_users, 'jconstant', 'rayjandom']) def _create_mime_types_file(self):
