Author: brane
Date: Tue Feb 3 15:09:25 2015
New Revision: 1656753
URL: http://svn.apache.org/r1656753
Log:
On the dump-load-cross-check branch: Make the DAV auto tests work with
dump/load cross-checking enabled.
* subversion/tests/cmdline/davautocheck.sh:
Create an htpasswd entry for the __dumpster__ user.
* subversion/tests/cmdline/svntest/sandbox.py
(Sandbox.verify_repo): Use the special svnrdump authentication
for the load phase of the cross-check, too.
Modified:
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/davautocheck.sh
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/svntest/sandbox.py
Modified:
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/dump-load-cross-check/subversion/tests/cmdline/davautocheck.sh?rev=1656753&r1=1656752&r2=1656753&view=diff
==============================================================================
---
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/davautocheck.sh
(original)
+++
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/davautocheck.sh
Tue Feb 3 15:09:25 2015
@@ -401,6 +401,7 @@ fi
say "Adding users for lock authentication"
$HTPASSWD -bc $HTTPD_USERS jrandom rayjandom
$HTPASSWD -b $HTTPD_USERS jconstant rayjandom
+$HTPASSWD -b $HTTPD_USERS __dumpster__ __loadster__
touch $HTTPD_MIME_TYPES
Modified:
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/svntest/sandbox.py
URL:
http://svn.apache.org/viewvc/subversion/branches/dump-load-cross-check/subversion/tests/cmdline/svntest/sandbox.py?rev=1656753&r1=1656752&r2=1656753&view=diff
==============================================================================
---
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/svntest/sandbox.py
(original)
+++
subversion/branches/dump-load-cross-check/subversion/tests/cmdline/svntest/sandbox.py
Tue Feb 3 15:09:25 2015
@@ -420,16 +420,16 @@ class Sandbox:
repo_dir_a_n, repo_url_a_n = self.add_repo_path('load_a_n')
svntest.main.create_repos(repo_dir_a_n)
svntest.actions.enable_revprop_changes(repo_dir_a_n)
- svntest.actions.run_and_verify_svnrdump(dumpfile_a_n,
- svntest.verify.AnyOutput,
- [], 0, 'load', repo_url_a_n)
+ svntest.actions.run_and_verify_svnrdump(
+ dumpfile_a_n, svntest.verify.AnyOutput, [], 0, 'load', repo_url_a_n,
+ svntest.main.svnrdump_crosscheck_authentication)
repo_dir_a_d, repo_url_a_d = self.add_repo_path('load_a_d')
svntest.main.create_repos(repo_dir_a_d)
svntest.actions.enable_revprop_changes(repo_dir_a_d)
- svntest.actions.run_and_verify_svnrdump(dumpfile_a_d,
- svntest.verify.AnyOutput,
- [], 0, 'load', repo_url_a_d)
+ svntest.actions.run_and_verify_svnrdump(
+ dumpfile_a_d, svntest.verify.AnyOutput, [], 0, 'load', repo_url_a_d,
+ svntest.main.svnrdump_crosscheck_authentication)
repo_dir_r_d, repo_url_r_d = self.add_repo_path('load_r_d')
svntest.main.create_repos(repo_dir_r_d)
