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 2011/10/19 16:34:15 UTC
svn commit: r1186240 - in /subversion/trunk/subversion/tests/cmdline:
authz_tests.py upgrade_tests.py
Author: philip
Date: Wed Oct 19 14:34:14 2011
New Revision: 1186240
URL: http://svn.apache.org/viewvc?rev=1186240&view=rev
Log:
Move an upgrade that uses authz to authz_tests to avoid spurious
test failures when running the upgrade tests in parallel.
* subversion/tests/cmdline/upgrade_tests.py
(upgrade_absent): Remove.
(test_list): Remove test.
* subversion/tests/cmdline/authz_tests.py
(): Import helpers.
(upgrade_absent): Add.
(test_list): Add test.
Modified:
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1186240&r1=1186239&r2=1186240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Wed Oct 19 14:34:14 2011
@@ -33,6 +33,9 @@ import svntest
from svntest.main import write_restrictive_svnserve_conf
from svntest.main import write_authz_file
from svntest.main import server_authz_has_aliases
+from upgrade_tests import (replace_sbox_with_tarfile,
+ replace_sbox_repo_with_tarfile,
+ wc_is_too_old_regex)
# (abbreviation)
Item = svntest.wc.StateItem
@@ -1354,6 +1357,41 @@ def wc_commit_error_handling(sbox):
'ci', wc_dir, '-m', '')
+@Skip(svntest.main.is_ra_type_file)
+def upgrade_absent(sbox):
+ "upgrade absent nodes to server-excluded"
+
+ # Install wc and repos
+ replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
+ replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
+
+ # Update config for authz
+ svntest.main.write_restrictive_svnserve_conf(sbox.repo_dir)
+ svntest.main.write_authz_file(sbox, { "/" : "*=rw",
+ "/A/B" : "*=",
+ "/A/B/E" : "jrandom = rw"})
+
+ # Attempt to use the working copy, this should give an error
+ expected_stderr = wc_is_too_old_regex
+ svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+ 'info', sbox.wc_dir)
+
+ # Now upgrade the working copy
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'upgrade', sbox.wc_dir)
+
+ # Relocate to allow finding the repository
+ svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ 'svn://127.0.0.1/authz_tests-2',
+ sbox.repo_url, sbox.wc_dir)
+
+ expected_output = svntest.wc.State(sbox.wc_dir, {
+ })
+
+ # Expect no changes and certainly no errors
+ svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
+ None, None)
+
########################################################################
# Run the tests
@@ -1382,6 +1420,7 @@ test_list = [ None,
authz_tree_conflict,
wc_delete,
wc_commit_error_handling,
+ upgrade_absent,
]
serial_only = True
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1186240&r1=1186239&r2=1186240&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed Oct 19 14:34:14 2011
@@ -1198,40 +1198,6 @@ def upgrade_file_externals(sbox):
'alpha' : {'pname3' : 'pvalue3' },
})
-@Skip(svntest.main.is_ra_type_file)
-def upgrade_absent(sbox):
- "upgrade absent nodes to server-excluded"
-
- # Install wc and repos
- replace_sbox_with_tarfile(sbox, 'upgrade_absent.tar.bz2')
- replace_sbox_repo_with_tarfile(sbox, 'upgrade_absent_repos.tar.bz2')
-
- # Update config for authz
- svntest.main.write_restrictive_svnserve_conf(sbox.repo_dir)
- svntest.main.write_authz_file(sbox, { "/" : "*=rw",
- "/A/B" : "*=",
- "/A/B/E" : "jrandom = rw"})
-
- # Attempt to use the working copy, this should give an error
- expected_stderr = wc_is_too_old_regex
- svntest.actions.run_and_verify_svn(None, None, expected_stderr,
- 'info', sbox.wc_dir)
-
- # Now upgrade the working copy
- svntest.actions.run_and_verify_svn(None, None, [],
- 'upgrade', sbox.wc_dir)
-
- # Relocate to allow finding the repository
- svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
- 'svn://127.0.0.1/authz_tests-2',
- sbox.repo_url, sbox.wc_dir)
-
- expected_output = svntest.wc.State(sbox.wc_dir, {
- })
-
- # Expect no changes and certainly no errors
- svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output,
- None, None)
@Issue(4035)
def upgrade_missing_replaced(sbox):
@@ -1312,7 +1278,6 @@ test_list = [ None,
upgrade_with_missing_subdir,
upgrade_locked,
upgrade_file_externals,
- upgrade_absent,
upgrade_missing_replaced,
]