You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/02/12 13:21:32 UTC
svn commit: r1659238 [18/21] - in /subversion/branches/fsx-1.10: ./
build/generator/ build/generator/templates/ subversion/bindings/swig/
subversion/include/ subversion/include/private/ subversion/libsvn_delta/
subversion/libsvn_fs_base/ subversion/lib...
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnauthz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnauthz_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnauthz_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnauthz_tests.py Thu Feb 12 12:21:31 2015
@@ -92,20 +92,20 @@ def svnauthz_validate_file_test(sbox):
svntest.main.file_write(authz_path, authz_content)
# Valid authz file
- svntest.actions.run_and_verify_svnauthz("Valid authz file", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
0, False, "validate", authz_path)
# Invalid authz file, expect exit code 1, we found the file loaded it
# but found an error
svntest.main.file_write(authz_path, 'x\n')
- svntest.actions.run_and_verify_svnauthz("Invalid authz file", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
1, False, "validate", authz_path)
# Non-existent authz file
# exit code 2, operational error since we can't test the file.
os.close(authz_fd)
os.remove(authz_path)
- svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 2, False, "validate",
authz_path)
@@ -134,18 +134,18 @@ def svnauthz_validate_repo_test(sbox):
# Valid authz url (file stored in repo)
authz_url = repo_url + '/A/authz'
- svntest.actions.run_and_verify_svnauthz("Valid authz url", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
0, False, "validate", authz_url)
# Invalid authz url (again use the iota file in the repo)
# expect exit code 1, we found the file loaded it but found an error
iota_url = repo_url + '/iota'
- svntest.actions.run_and_verify_svnauthz("Invalid authz url", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
1, False, "validate", iota_url)
# Non-existent authz url
# exit code 2, operational error since we can't test the file.
- svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 2, False, "validate",
repo_url + "/zilch")
@@ -220,38 +220,35 @@ def svnauthz_accessof_file_test(sbox):
# Anonymous access with no path, and no repository should be rw
# since it returns the highest level of access granted anywhere.
# So /bios being rw for everyone means this will be rw.
- svntest.actions.run_and_verify_svnauthz("Anonymous access", ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_path)
# Anonymous access on /jokes should be r, no repo so won't match
# the slapstick:/jokes section.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path",
- ["r\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None, 0, False, "accessof",
authz_path, "--path", "/jokes")
# Anonymous access on /jokes on slapstick repo should be no
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
- ["no\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--repository", "slapstick")
# User access with no path, and no repository should be rw
# since it returns the h ighest level of access anywhere.
# So /bios being rw for everyone means this will be rw.
- svntest.actions.run_and_verify_svnauthz("User access", ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_path,
"--username", "groucho")
# User groucho specified on /jokes with no repo, will not match any of the
# repo specific sections, so is r since everyone has read access.
- svntest.actions.run_and_verify_svnauthz("User access on path", ["r\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None,
0, False, "accessof", authz_path,
"--path", "/jokes", "--username",
"groucho")
# User groucho specified on /jokes with the repo comedy will be rw
- svntest.actions.run_and_verify_svnauthz("User access on path with repo",
- ["rw\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy")
@@ -289,38 +286,35 @@ def svnauthz_accessof_repo_test(sbox):
# since it returns the highest level of access granted anywhere.
# So /bios being rw for everyone means this will be rw.
authz_url = repo_url + "/A/authz"
- svntest.actions.run_and_verify_svnauthz("Anonymous access", ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_url)
# Anonymous access on /jokes should be r, no repo so won't match
# the slapstick:/jokes section.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path",
- ["r\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None, 0, False, "accessof",
authz_url, "--path", "/jokes")
# Anonymous access on /jokes on slapstick repo should be no
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
- ["no\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--repository", "slapstick")
# User access with no path, and no repository should be rw
# since it returns the h ighest level of access anywhere.
# So /bios being rw for everyone means this will be rw.
- svntest.actions.run_and_verify_svnauthz("User access", ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_url,
"--username", "groucho")
# User groucho specified on /jokes with no repo, will not match any of the
# repo specific sections, so is r since everyone has read access.
- svntest.actions.run_and_verify_svnauthz("User access on path", ["r\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None,
0, False, "accessof", authz_url,
"--path", "/jokes", "--username",
"groucho")
# User groucho specified on /jokes with the repo comedy will be rw
- svntest.actions.run_and_verify_svnauthz("User access on path with repo",
- ["rw\n"], None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy")
@@ -341,29 +335,26 @@ def svnauthz_accessof_groups_file_test(s
# Anonymous access with no path, and no repository should be no
# since it returns the highest level of access granted anywhere.
- svntest.actions.run_and_verify_svnauthz("Anonymous access", ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path)
# User stafford (@musicians) access with no path, and no repository should
# be no since it returns the highest level of access granted anywhere.
- svntest.actions.run_and_verify_svnauthz("Group 1 access",
- ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path,
"--username", "stafford")
# User groucho (@comedians) access with no path, and no repository should
# be no since it returns the highest level of access granted anywhere.
- svntest.actions.run_and_verify_svnauthz("Group 2 access",
- ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path,
"--username", "groucho")
# Anonymous access specified on /jokes with the repo comedy will be no.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
- ["no\n"], None, 0, False,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False,
"accessof", authz_path,
"--groups-file", groups_path,
"--path", "jokes",
@@ -371,8 +362,7 @@ def svnauthz_accessof_groups_file_test(s
# User stafford (@musicians) specified on /jokes with the repo comedy
# will be no.
- svntest.actions.run_and_verify_svnauthz("Group 1 access on path with repo",
- ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path,
"--path", "jokes",
@@ -381,8 +371,7 @@ def svnauthz_accessof_groups_file_test(s
# User groucho (@comedians) specified on /jokes with the repo
# comedy will be r.
- svntest.actions.run_and_verify_svnauthz("Group 2 access on path with repo",
- ["r\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None,
0, False, "accessof", authz_path,
"--groups-file", groups_path,
"--path", "jokes",
@@ -431,29 +420,26 @@ def svnauthz_accessof_groups_repo_test(s
# since it returns the highest level of access granted anywhere.
authz_url = repo_url + "/A/authz"
groups_url = repo_url + "/A/groups"
- svntest.actions.run_and_verify_svnauthz("Anonymous access", ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url)
# User stafford (@musicians) access with no path, and no repository should
# be no since it returns the highest level of access granted anywhere.
- svntest.actions.run_and_verify_svnauthz("Group 1 access",
- ["rw\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url,
"--username", "stafford")
# User groucho (@comedians) access with no path, and no repository should
# be no since it returns the highest level of access granted anywhere.
- svntest.actions.run_and_verify_svnauthz("Group 2 access",
- ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url,
"--username", "groucho")
# Anonymous access specified on /jokes with the repo comedy will be no.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
- ["no\n"], None, 0, False,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False,
"accessof", authz_url,
"--groups-file", groups_url,
"--path", "jokes",
@@ -461,8 +447,7 @@ def svnauthz_accessof_groups_repo_test(s
# User stafford (@musicians) specified on /jokes with the repo comedy
# will be no.
- svntest.actions.run_and_verify_svnauthz("Group 1 access on path with repo",
- ["no\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["no\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url,
"--path", "jokes",
@@ -471,8 +456,7 @@ def svnauthz_accessof_groups_repo_test(s
# User groucho (@comedians) specified on /jokes with the repo
# comedy will be r.
- svntest.actions.run_and_verify_svnauthz("Group 2 access on path with repo",
- ["r\n"], None,
+ svntest.actions.run_and_verify_svnauthz(["r\n"], None,
0, False, "accessof", authz_url,
"--groups-file", groups_url,
"--path", "jokes",
@@ -495,7 +479,7 @@ def svnauthz_accessof_is_file_test(sbox)
expected_output = svntest.verify.RegexOutput(
".*'x' is not a valid argument for --is", match_all=False
)
- svntest.actions.run_and_verify_svnauthz("--is x fails", None,
+ svntest.actions.run_and_verify_svnauthz(None,
expected_output, 2, False,
"accessof", authz_path, "--is", "x")
@@ -503,52 +487,46 @@ def svnauthz_accessof_is_file_test(sbox)
# since it returns the highest level of access granted anywhere.
# So /bios being rw for everyone means this will be rw.
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is rw", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 0, False, "accessof",
authz_path, "--is", "rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is r", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_path, "--is", "r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is no", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_path, "--is", "no")
# Anonymous access on /jokes should be r, no repo so won't match
# the slapstick:/jokes section.
# Test --is r returns 0.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--is", "r")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--is", "rw")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--is", "no")
# Anonymous access on /jokes on slapstick repo should be no
# Test --is no returns 0.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--repository", "slapstick",
"--is", "no")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--repository", "slapstick",
"--is", "rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--repository", "slapstick",
"--is", "r")
@@ -557,17 +535,17 @@ def svnauthz_accessof_is_file_test(sbox)
# since it returns the h ighest level of access anywhere.
# So /bios being rw for everyone means this will be rw.
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("User access --is rw", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
0, False, "accessof", authz_path,
"--username", "groucho", "--is",
"rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("User access --is r", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
3, False, "accessof", authz_path,
"--username", "groucho", "--is",
"r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access --is no", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
3, False, "accessof", authz_path,
"--username", "groucho", "--is",
"no")
@@ -575,18 +553,18 @@ def svnauthz_accessof_is_file_test(sbox)
# User groucho specified on /jokes with no repo, will not match any of the
# repo specific sections, so is r since everyone has read access.
# Test --is r returns 0.
- svntest.actions.run_and_verify_svnauthz("User access on path --is r", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho", "--is", "r")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path --is rw", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
"--is", "rw")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path --is no", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
@@ -594,22 +572,19 @@ def svnauthz_accessof_is_file_test(sbox)
# User groucho specified on /jokes with the repo comedy will be rw
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
"rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
"r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_path, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
@@ -622,8 +597,7 @@ def svnauthz_accessof_is_file_test(sbox)
".*Error while parsing config file:",
match_all=False
)
- svntest.actions.run_and_verify_svnauthz("--is with invalid authz file",
- None, expected_out, 1, False,
+ svntest.actions.run_and_verify_svnauthz(None, expected_out, 1, False,
"accessof", authz_path, "--path",
"/jokes", "--username", "groucho",
"--repository", "comedy", "--is",
@@ -664,7 +638,7 @@ def svnauthz_accessof_is_repo_test(sbox)
expected_output = svntest.verify.RegexOutput(
".*'x' is not a valid argument for --is", match_all=False
)
- svntest.actions.run_and_verify_svnauthz("--is x fails", None,
+ svntest.actions.run_and_verify_svnauthz(None,
expected_output, 2, False,
"accessof", authz_url, "--is", "x")
@@ -672,52 +646,46 @@ def svnauthz_accessof_is_repo_test(sbox)
# since it returns the highest level of access granted anywhere.
# So /bios being rw for everyone means this will be rw.
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is rw", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 0, False, "accessof",
authz_url, "--is", "rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is r", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_url, "--is", "r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access --is no", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_url, "--is", "no")
# Anonymous access on /jokes should be r, no repo so won't match
# the slapstick:/jokes section.
# Test --is r returns 0.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--is", "r")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--is", "rw")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--is", "no")
# Anonymous access on /jokes on slapstick repo should be no
# Test --is no returns 0.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--repository", "slapstick",
"--is", "no")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--repository", "slapstick",
"--is", "rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--repository", "slapstick",
"--is", "r")
@@ -726,17 +694,17 @@ def svnauthz_accessof_is_repo_test(sbox)
# since it returns the h ighest level of access anywhere.
# So /bios being rw for everyone means this will be rw.
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("User access --is rw", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
0, False, "accessof", authz_url,
"--username", "groucho", "--is",
"rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("User access --is r", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
3, False, "accessof", authz_url,
"--username", "groucho", "--is",
"r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access --is no", None, None,
+ svntest.actions.run_and_verify_svnauthz(None, None,
3, False, "accessof", authz_url,
"--username", "groucho", "--is",
"no")
@@ -744,18 +712,18 @@ def svnauthz_accessof_is_repo_test(sbox)
# User groucho specified on /jokes with no repo, will not match any of the
# repo specific sections, so is r since everyone has read access.
# Test --is r returns 0.
- svntest.actions.run_and_verify_svnauthz("User access on path --is r", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho", "--is", "r")
# Test --is rw returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path --is rw", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--is", "rw")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path --is no", None,
+ svntest.actions.run_and_verify_svnauthz(None,
None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
@@ -763,22 +731,19 @@ def svnauthz_accessof_is_repo_test(sbox)
# User groucho specified on /jokes with the repo comedy will be rw
# Test --is rw returns 0.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
- None, None, 0, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
"rw")
# Test --is r returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is r",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
"r")
# Test --is no returns 3.
- svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is no",
- None, None, 3, False, "accessof",
+ svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
authz_url, "--path", "/jokes",
"--username", "groucho",
"--repository", "comedy", "--is",
@@ -797,8 +762,7 @@ def svnauthz_accessof_is_repo_test(sbox)
".*Error while parsing config file:",
match_all=False
)
- svntest.actions.run_and_verify_svnauthz("--is with invalid authz url",
- None, expected_out, 1, False,
+ svntest.actions.run_and_verify_svnauthz(None, expected_out, 1, False,
"accessof", authz_url, "--path",
"/jokes", "--username", "groucho",
"--repository", "comedy", "--is",
@@ -883,14 +847,12 @@ def svnauthz_compat_mode_file_test(sbox)
svntest.main.file_write(authz_path, authz_content)
# Check a valid file.
- svntest.actions.run_and_verify_svnauthz("svnauthz-validate on file",
- None, None, 0, True,
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, True,
authz_path)
# Check an invalid file.
svntest.main.file_append(authz_path, "x\n")
- svntest.actions.run_and_verify_svnauthz("svnauthz-validate on invalid file",
- None, None, 1, True,
+ svntest.actions.run_and_verify_svnauthz(None, None, 1, True,
authz_path)
# Remove the file.
@@ -899,7 +861,7 @@ def svnauthz_compat_mode_file_test(sbox)
# Check a non-existent file.
svntest.actions.run_and_verify_svnauthz(
- "svnauthz-validate on non-existent file", None, None, 2, True,
+ None, None, 2, True,
authz_path
)
@@ -928,8 +890,7 @@ def svnauthz_compat_mode_repo_test(sbox)
if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir):
raise svntest.Failure
- svntest.actions.run_and_verify_svnauthz("svnauthz-validate on url",
- None, None, 0, True,
+ svntest.actions.run_and_verify_svnauthz(None, None, 0, True,
authz_url)
# Check an invalid url.
@@ -939,14 +900,13 @@ def svnauthz_compat_mode_repo_test(sbox)
if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
expected_status, None, wc_dir):
raise svntest.Failure
- svntest.actions.run_and_verify_svnauthz("svnauthz-validate on invalid file",
- None, None, 1, True,
+ svntest.actions.run_and_verify_svnauthz(None, None, 1, True,
authz_path)
# Check a non-existent url.
# Exit code really should be 2 since this is an operational error.
svntest.actions.run_and_verify_svnauthz(
- "svnauthz-validate on non-existent file", None, None, 2, True,
+ None, None, 2, True,
repo_url + "/zilch"
)
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svndumpfilter_tests.py Thu Feb 12 12:21:31 2015
@@ -106,7 +106,7 @@ def reflect_dropped_renumbered_revs(sbox
expected_output = svntest.verify.UnorderedOutput([
url + "/trunk - /branch1:4-5\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)
@@ -125,7 +125,7 @@ def reflect_dropped_renumbered_revs(sbox
expected_output = svntest.verify.UnorderedOutput([
url + "/trunk - \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)
@@ -152,7 +152,7 @@ def svndumpfilter_loses_mergeinfo(sbox):
expected_output = svntest.verify.UnorderedOutput([
url + "/trunk - /branch1:4-8\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)
@@ -351,7 +351,7 @@ def filter_mergeinfo_revs_outside_of_dum
url + "/B2 - /trunk:4\n",
url + "/B1/B/E - /branches/B2/B/E:6-7\n",
"/trunk/B/E:3-4\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)
@@ -478,7 +478,7 @@ def filter_mergeinfo_revs_outside_of_dum
expected_output = svntest.verify.UnorderedOutput([
url + "/B1 - /Projects/Project-X/trunk:9\n",
url + "/B1/B/E - /Projects/Project-X/trunk/B/E: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)
@@ -584,7 +584,7 @@ def dropped_but_not_renumbered_empty_rev
expected_output = svntest.verify.UnorderedOutput([
url + "/B1 - /trunk:6,8\n",
url + "/B1/B/E - /trunk/B/E:5-8\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)
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnlook_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnlook_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnlook_tests.py Thu Feb 12 12:21:31 2015
@@ -209,9 +209,9 @@ def delete_file_in_moved_dir(sbox):
# move E to E2 and delete E2/alpha
E_path = os.path.join(wc_dir, 'A', 'B', 'E')
E2_path = os.path.join(wc_dir, 'A', 'B', 'E2')
- svntest.actions.run_and_verify_svn(None, None, [], 'mv', E_path, E2_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mv', E_path, E2_path)
alpha_path = os.path.join(E2_path, 'alpha')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', alpha_path)
# commit
expected_output = svntest.wc.State(wc_dir, {
@@ -263,16 +263,16 @@ def test_print_property_diffs(sbox):
# Add a bogus property to iota
iota_path = os.path.join(wc_dir, 'iota')
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'bogus_prop', 'bogus_val', iota_path)
# commit the change
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg', iota_path)
# Grab the diff
exit_code, expected_output, err = svntest.actions.run_and_verify_svn(
- None, None, [], 'diff', '-r', 'PREV', iota_path)
+ None, [], 'diff', '-r', 'PREV', iota_path)
exit_code, output, errput = svntest.main.run_svnlook("diff", repo_dir)
if errput:
@@ -370,7 +370,7 @@ def changed_copy_info(sbox):
E_path = os.path.join(wc_dir, 'A', 'B', 'E')
alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
alpha2_path = os.path.join(wc_dir, 'A', 'alpha2')
- svntest.actions.run_and_verify_svn(None, None, [], 'cp', alpha_path,
+ svntest.actions.run_and_verify_svn(None, [], 'cp', alpha_path,
alpha2_path)
# commit
@@ -446,10 +446,10 @@ def limit_history(sbox):
"history --limit"
sbox.build(create_wc=False)
repo_url = sbox.repo_url
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mv', '-m', 'log msg',
repo_url + "/iota", repo_url + "/iota2")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mv', '-m', 'log msg',
repo_url + "/A/mu", repo_url + "/iota")
history = run_svnlook("history", "--limit=1", sbox.repo_dir)
@@ -542,7 +542,7 @@ def diff_ignore_eolstyle(sbox):
# Grab the diff
exit_code, expected_output, err = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'diff', '-r', 'PREV', '-x', '--ignore-eol-style', mu_path)
@@ -676,9 +676,9 @@ fp.close()"""
svntest.main.file_append(rho_path, 'new appended text for rho')
# commit, and check the hook's logfile
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg', wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', wc_dir)
expected_data = [ 'U A/D/G/rho\n', 'U A/mu\n', 'A/\n', 'A/D/G/\n' ]
@@ -694,9 +694,9 @@ fp.close()"""
svntest.main.create_python_hook_script(pre_commit_hook,
hook_instance)
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'bogus_prop', 'bogus_val\n', A_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg', wc_dir,
'--with-revprop', 'bogus_rev_prop=bogus_rev_val\n')
# Now check the logfile
@@ -726,7 +726,7 @@ def property_delete(sbox):
sbox.simple_propdel('foo', 'A/mu')
sbox.simple_commit()
- svntest.actions.run_and_verify_svnlook(None, ["_U A/mu\n"], [],
+ svntest.actions.run_and_verify_svnlook(["_U A/mu\n"], [],
'changed', repo_dir)
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnmucc_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnmucc_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnmucc_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnmucc_tests.py Thu Feb 12 12:21:31 2015
@@ -43,7 +43,7 @@ def reject_bogus_mergeinfo(sbox):
# At present this tests the server, but if we ever make svnmucc
# validate the mergeinfo up front then it will only test the client
- svntest.actions.run_and_verify_svnmucc(None, [], expected_error,
+ svntest.actions.run_and_verify_svnmucc([], expected_error,
'propset', 'svn:mergeinfo', '/B:0',
'-m', 'log msg',
sbox.repo_url + '/A')
@@ -340,20 +340,20 @@ def basic_svnmucc(sbox):
def propset_root_internal(sbox, target):
## propset on ^/
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-m', 'log msg',
'propset', 'foo', 'bar',
target)
- svntest.actions.run_and_verify_svn(None, 'bar', [],
+ svntest.actions.run_and_verify_svn('bar', [],
'propget', '--strict', 'foo',
target)
## propdel on ^/
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-m', 'log msg',
'propdel', 'foo',
target)
- svntest.actions.run_and_verify_svn(None, [],
+ svntest.actions.run_and_verify_svn([],
'.*W200017: Property.*not found',
'propget', '--strict', 'foo',
target)
@@ -416,14 +416,14 @@ def nested_replaces(sbox):
sbox.build(create_wc=False)
repo_url = sbox.repo_url
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-U', repo_url, '-m', 'r2: create tree',
'rm', 'A',
'rm', 'iota',
'mkdir', 'A', 'mkdir', 'A/B', 'mkdir', 'A/B/C',
'mkdir', 'M', 'mkdir', 'M/N', 'mkdir', 'M/N/O',
'mkdir', 'X', 'mkdir', 'X/Y', 'mkdir', 'X/Y/Z')
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-U', repo_url, '-m', 'r3: nested replaces',
*("""
rm A rm M rm X
@@ -449,7 +449,7 @@ rm A/B/C/Y
]) + [
'^-', '^r3', '^-', '^Changed paths:',
])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'log', '-qvr3', repo_url)
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnrdump_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnrdump_tests.py Thu Feb 12 12:21:31 2015
@@ -166,7 +166,7 @@ def run_load_test(sbox, dumpfile_name, e
# Set the UUID of the sbox repository to the UUID specified in the
# dumpfile ### RA layer doesn't have a set_uuid functionality
uuid = original_dumpfile[2].split(' ')[1][:-1]
- svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
+ svntest.actions.run_and_verify_svnadmin2(None, None, 0,
'setuuid', sbox.repo_dir,
uuid)
@@ -422,7 +422,7 @@ def reflect_dropped_renumbered_revs(sbox
# Create the 'toplevel' directory in repository and then load the same
# dumpfile into that subtree.
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 10.\n'],
[], "mkdir", sbox.repo_url + "/toplevel",
"-m", "Create toplevel dir to load into")
@@ -436,7 +436,7 @@ def reflect_dropped_renumbered_revs(sbox
url + "/trunk - /branch1:4-8\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)
@@ -534,7 +534,7 @@ def dont_drop_valid_mergeinfo_during_inc
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)
@@ -596,7 +596,7 @@ def dont_drop_valid_mergeinfo_during_inc
# 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)
@@ -660,7 +660,7 @@ def dont_drop_valid_mergeinfo_during_inc
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)
@@ -702,7 +702,7 @@ def dont_drop_valid_mergeinfo_during_inc
# 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)
@@ -719,7 +719,7 @@ def svnrdump_load_partial_incremental_du
# Create the 'A' directory in repository and then load the partial
# incremental dump into the root of the repository.
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/A",
"-m", "Create toplevel dir to load into")
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_authz_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_authz_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_authz_tests.py Thu Feb 12 12:21:31 2015
@@ -83,13 +83,11 @@ def basic_authz(sbox):
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,
+ svntest.actions.run_and_verify_svn([], svntest.verify.AnyOutput,
'cat',
lambda_url)
# this file should have been synced
- svntest.actions.run_and_verify_svn(None,
- svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
'cat',
iota_url)
@@ -106,7 +104,6 @@ def copy_from_unreadable_dir(sbox):
# 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',
@@ -114,7 +111,6 @@ def copy_from_unreadable_dir(sbox):
sbox.wc_dir + '/A/B/lambda')
svntest.actions.run_and_verify_svn(None,
- None,
[],
'pset',
'baz',
@@ -122,7 +118,6 @@ def copy_from_unreadable_dir(sbox):
sbox.wc_dir + '/A/B')
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
sbox.wc_dir + '/A/B',
@@ -130,7 +125,6 @@ def copy_from_unreadable_dir(sbox):
# Now copy that directory so we'll see it in our synced copy
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
B_url,
@@ -183,15 +177,13 @@ def copy_from_unreadable_dir(sbox):
expected_out,
out[2:11])
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
+ svntest.actions.run_and_verify_svn(['bar\n'],
[],
'pget',
'foo',
dest_sbox.repo_url + '/A/P/lambda')
- svntest.actions.run_and_verify_svn(None,
- ['zot\n'],
+ svntest.actions.run_and_verify_svn(['zot\n'],
[],
'pget',
'baz',
@@ -207,7 +199,6 @@ def copy_with_mod_from_unreadable_dir(sb
# Make a copy of the B directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/B',
@@ -215,7 +206,6 @@ def copy_with_mod_from_unreadable_dir(sb
# Set a property inside the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'pset',
'foo',
@@ -224,7 +214,6 @@ def copy_with_mod_from_unreadable_dir(sb
# 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')
@@ -234,14 +223,12 @@ def copy_with_mod_from_unreadable_dir(sb
# 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,
@@ -295,8 +282,7 @@ def copy_with_mod_from_unreadable_dir(sb
expected_out,
out[2:12])
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
+ svntest.actions.run_and_verify_svn(['bar\n'],
[],
'pget',
'foo',
@@ -312,7 +298,6 @@ def copy_with_mod_from_unreadable_dir_an
# Make a copy of the B directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/B',
@@ -321,7 +306,6 @@ def copy_with_mod_from_unreadable_dir_an
# Copy a (readable) file into the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/D/gamma',
@@ -330,7 +314,6 @@ def copy_with_mod_from_unreadable_dir_an
# Commit the copy-with-modification.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
sbox.wc_dir,
@@ -457,8 +440,7 @@ def specific_deny_authz(sbox):
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,
+ svntest.actions.run_and_verify_svn([], svntest.verify.AnyOutput,
'cat',
lambda_url)
@@ -469,7 +451,7 @@ def copy_delete_unreadable_child(sbox):
# Prepare the source: Greek tree (r1), cp+rm (r2).
sbox.build(create_wc = False)
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-m', 'r2',
'-U', sbox.repo_url,
'cp', 'HEAD', '/', 'branch',
@@ -495,8 +477,7 @@ def copy_delete_unreadable_child(sbox):
run_sync(dest_url)
# sanity check
- svntest.actions.run_and_verify_svn(None,
- ["iota\n"], [],
+ svntest.actions.run_and_verify_svn(["iota\n"], [],
'ls', dest_url+'/branch@2')
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnsync_tests.py Thu Feb 12 12:21:31 2015
@@ -121,7 +121,7 @@ def setup_and_sync(sbox, dump_file_conte
# 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,
+ svntest.actions.run_and_verify_svnadmin2(None, None, 0,
'setuuid', dest_sbox.repo_dir,
output[0][:-1])
@@ -162,7 +162,7 @@ def verify_mirror(dest_sbox, exp_dump_fi
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",
+ None, [], "propdel", "--revprop", "-r", "0",
prop_name, dest_sbox.repo_url)
# Create a dump file from the mirror repository.
@@ -294,7 +294,6 @@ def detect_meddling(sbox):
svntest.main.safe_rmtree(dest_sbox.wc_dir)
svntest.actions.run_and_verify_svn(None,
- None,
[],
'co',
dest_sbox.repo_url,
@@ -306,7 +305,6 @@ def detect_meddling(sbox):
run_sync(dest_sbox.repo_url)
svntest.actions.run_and_verify_svn(None,
- None,
[],
'up',
dest_sbox.wc_dir)
@@ -315,7 +313,6 @@ def detect_meddling(sbox):
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',
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/actions.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/actions.py Thu Feb 12 12:21:31 2015
@@ -169,10 +169,9 @@ def guarantee_greek_repository(path, min
main.chmod_tree(path, 0666, 0666)
# give the repository a unique UUID
- run_and_verify_svnadmin("could not set uuid", [], [], 'setuuid', path)
+ run_and_verify_svnadmin([], [], 'setuuid', path)
-def run_and_verify_atomic_ra_revprop_change(message,
- expected_stdout,
+def run_and_verify_atomic_ra_revprop_change(expected_stdout,
expected_stderr,
expected_exit,
url, revision, propname,
@@ -202,11 +201,11 @@ def run_and_verify_atomic_ra_revprop_cha
want_error)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnlook(message, expected_stdout,
+def run_and_verify_svnlook(expected_stdout,
expected_stderr, *varargs):
"""Like run_and_verify_svnlook2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -214,21 +213,21 @@ def run_and_verify_svnlook(message, expe
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnlook2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnlook2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnlook2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnlook2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnlook command and check its output and exit code."""
exit_code, out, err = main.run_svnlook(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnadmin(message, expected_stdout,
+def run_and_verify_svnadmin(expected_stdout,
expected_stderr, *varargs):
"""Like run_and_verify_svnadmin2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -236,21 +235,21 @@ def run_and_verify_svnadmin(message, exp
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnadmin2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnadmin2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnadmin2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnadmin2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnadmin command and check its output and exit code."""
exit_code, out, err = main.run_svnadmin(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnversion(message, wc_dir, trail_url,
+def run_and_verify_svnversion(wc_dir, trail_url,
expected_stdout, expected_stderr, *varargs):
"""like run_and_verify_svnversion2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -258,11 +257,11 @@ def run_and_verify_svnversion(message, w
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnversion2(message, wc_dir, trail_url,
+ return run_and_verify_svnversion2(wc_dir, trail_url,
expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnversion2(message, wc_dir, trail_url,
+def run_and_verify_svnversion2(wc_dir, trail_url,
expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnversion command and check its output and exit code."""
@@ -274,10 +273,10 @@ def run_and_verify_svnversion2(message,
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svn(message, expected_stdout, expected_stderr, *varargs):
+def run_and_verify_svn(expected_stdout, expected_stderr, *varargs):
"""like run_and_verify_svn2, but the expected exit code is assumed to
be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -288,10 +287,10 @@ def run_and_verify_svn(message, expected
expected_exit = 1
elif expected_stderr != []:
expected_exit = 1
- return run_and_verify_svn2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svn2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svn2(message, expected_stdout, expected_stderr,
+def run_and_verify_svn2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Invoke main.run_svn() with *VARARGS. Return exit code as int; stdout,
stderr as lists of lines (including line terminators). For both
@@ -306,7 +305,7 @@ def run_and_verify_svn2(message, expecte
- If it is already an instance of ExpectedOutput
(e.g. UnorderedOutput), leave it alone.
- ...and invoke compare_and_display_lines() on MESSAGE, a label based
+ ...and invoke compare_and_display_lines() on a label based
on the name of the stream being compared (e.g. STDOUT), the
ExpectedOutput instance, and the actual output.
@@ -328,8 +327,9 @@ def run_and_verify_svn2(message, expecte
want_err = True
exit_code, out, err = main.run_svn(want_err, *varargs)
- verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_outputs("Unexpected output", out, err,
+ expected_stdout, expected_stderr)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
def run_and_verify_load(repo_dir, dump_file_content,
@@ -352,7 +352,7 @@ def run_and_verify_dump(repo_dir, deltas
if deltas:
args += ('--deltas',)
exit_code, output, errput = run_and_verify_svnadmin(
- None, verify.AnyOutput, [],
+ verify.AnyOutput, [],
'dump', '--quiet', repo_dir, *args)
return output
@@ -380,24 +380,24 @@ def run_and_verify_svnrdump(dumpfile_con
return output
-def run_and_verify_svnmucc(message, expected_stdout, expected_stderr,
+def run_and_verify_svnmucc(expected_stdout, expected_stderr,
*varargs):
"""Run svnmucc command and check its output"""
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnmucc2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnmucc2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnmucc2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnmucc2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnmucc command and check its output and exit code."""
exit_code, out, err = main.run_svnmucc(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
@@ -443,7 +443,7 @@ def load_repo(sbox, dumpfile_path = None
# Load the mergetracking dumpfile into the repos, and check it out the repo
run_and_verify_load(sbox.repo_dir, dump_str.splitlines(True),
bypass_prop_validation)
- run_and_verify_svn(None, None, [], "co", sbox.repo_url, sbox.wc_dir)
+ run_and_verify_svn(None, [], "co", sbox.repo_url, sbox.wc_dir)
return dump_str
@@ -455,7 +455,7 @@ def expected_noop_update_output(rev):
% (rev),
"no-op update")
-def run_and_verify_svnauthz(message, expected_stdout, expected_stderr,
+def run_and_verify_svnauthz(expected_stdout, expected_stderr,
expected_exit, compat_mode, *varargs):
"""Run svnauthz command and check its output and exit code.
If COMPAT_MODE is True then run the command in pre-1.8
@@ -468,7 +468,7 @@ def run_and_verify_svnauthz(message, exp
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
######################################################################
@@ -717,14 +717,12 @@ class LogParser:
self.entries[-1].changed_paths[self.use_cdata()] = [{'kind': self.kind,
'action': self.action}]
-def run_and_verify_log_xml(message=None, expected_log_attrs=None,
+def run_and_verify_log_xml(expected_log_attrs=None,
expected_paths=None, expected_revprops=None,
expected_stdout=None, expected_stderr=None,
args=[]):
"""Call run_and_verify_svn with log --xml and args (optional) as command
- arguments, and pass along message, expected_stdout, and expected_stderr.
-
- If message is None, pass the svn log command as message.
+ arguments, and pass along expected_stdout, and expected_stderr.
expected_paths checking is not yet implemented.
@@ -740,8 +738,7 @@ def run_and_verify_log_xml(message=None,
expected_paths and expected_revprops are ignored if expected_stdout or
expected_stderr is specified.
"""
- if message == None:
- message = ' '.join(args)
+ message = ' '.join(args)
# We'll parse the output unless the caller specifies expected_stderr or
# expected_stdout for run_and_verify_svn.
@@ -758,7 +755,7 @@ def run_and_verify_log_xml(message=None,
log_args.append('-v')
(exit_code, stdout, stderr) = run_and_verify_svn(
- message, expected_stdout, expected_stderr,
+ expected_stdout, expected_stderr,
'log', '--xml', *log_args)
if not parse:
return
@@ -1597,7 +1594,7 @@ def run_and_verify_status_xml(expected_e
EXPECTED_ENTRIES.
"""
- exit_code, output, errput = run_and_verify_svn(None, None, [],
+ exit_code, output, errput = run_and_verify_svn(None, [],
'status', '--xml', *args)
if len(errput) > 0:
@@ -1669,11 +1666,11 @@ def run_and_verify_inherited_prop_xml(pa
if (propname):
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- None, None, [], 'propget', propname, '--xml',
+ None, [], 'propget', propname, '--xml',
'--show-inherited-props', path_or_url, *args)
else:
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- None, None, [], 'proplist', '-v', '--xml', '--show-inherited-props',
+ None, [], 'proplist', '-v', '--xml', '--show-inherited-props',
path_or_url, *args)
if len(errput) > 0:
@@ -1746,7 +1743,7 @@ def run_and_verify_diff_summarize_xml(er
EXPECTED_PROPS and EXPECTED_KINDS. Returns on success, raises
on failure."""
- exit_code, output, errput = run_and_verify_svn(None, None, error_re_string,
+ exit_code, output, errput = run_and_verify_svn(None, error_re_string,
'diff', '--summarize',
'--xml', *args)
@@ -1830,12 +1827,12 @@ def run_and_validate_lock(path, username
comment = "Locking path:%s." % path
# lock the path
- run_and_verify_svn(None, ".*locked by user", [], 'lock',
+ run_and_verify_svn(".*locked by user", [], 'lock',
'--username', username,
'-m', comment, path)
# Run info and check that we get the lock fields.
- exit_code, output, err = run_and_verify_svn(None, None, [],
+ exit_code, output, err = run_and_verify_svn(None, [],
'info','-R',
path)
@@ -1873,7 +1870,7 @@ def _run_and_verify_resolve(cmd, expecte
expected_paths]),
],
match_all=False)
- run_and_verify_svn(None, expected_output, [],
+ run_and_verify_svn(expected_output, [],
cmd, *args)
def run_and_verify_resolve(expected_paths, *args):
@@ -1897,7 +1894,7 @@ def run_and_verify_revert(expected_paths
expected_output = verify.UnorderedOutput([
"Reverted '" + path + "'\n" for path in
expected_paths])
- run_and_verify_svn(None, expected_output, [],
+ run_and_verify_svn(expected_output, [],
"revert", *args)
@@ -2293,6 +2290,6 @@ def build_greek_tree_conflicts(sbox):
# Update, receiving the incoming changes on top of the local changes,
# causing tree conflicts. Don't check for any particular result: that is
# the job of other tests.
- run_and_verify_svn(None, verify.AnyOutput, [], 'update', wc_dir)
+ run_and_verify_svn(verify.AnyOutput, [], 'update', wc_dir)
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/deeptrees.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/deeptrees.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/deeptrees.py Thu Feb 12 12:21:31 2015
@@ -123,13 +123,13 @@ def deep_trees_leaf_edit(base):
main.file_append(F, "More text for file alpha.\n")
main.file_append(DF, "More text for file beta.\n")
main.file_append(DDF, "More text for file gamma.\n")
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'propset', 'prop1', '1', F, DF, DDF)
D = j(base, 'D', 'D1')
DD = j(base, 'DD', 'D1', 'D2')
DDD = j(base, 'DDD', 'D1', 'D2', 'D3')
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'propset', 'prop1', '1', D, DD, DDD)
D = j(base, 'D', 'D1', 'delta')
DD = j(base, 'DD', 'D1', 'D2', 'epsilon')
@@ -137,7 +137,7 @@ def deep_trees_leaf_edit(base):
main.file_append(D, "This is the file 'delta'.\n")
main.file_append(DD, "This is the file 'epsilon'.\n")
main.file_append(DDD, "This is the file 'zeta'.\n")
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'add', D, DD, DDD)
# deep trees state after a call to deep_trees_leaf_edit
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/factory.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/factory.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/factory.py Thu Feb 12 12:21:31 2015
@@ -500,7 +500,7 @@ class TestFactory:
else:
py = "expected_stdout = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += "actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0"
+ py += "actions.run_and_verify_svn2(expected_stdout, [], 0"
else:
# write a test that expects failure
pylist = self.strlist2py(err)
@@ -509,8 +509,7 @@ class TestFactory:
else:
py = "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += ("actions.run_and_verify_svn2('OUTPUT', " +
- "[], expected_stderr, " + str(code))
+ py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code))
if len(pyargs) > 0:
py += ", " + ", ".join(pyargs)
@@ -775,8 +774,7 @@ class TestFactory:
else:
py += "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += ("actions.run_and_verify_svn2('OUTPUT', " +
- "[], expected_stderr, " + str(code) +
+ py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code) +
", " + url_arg.pyarg + ", " + wc_arg.pyarg)
# Append the remaining args
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/mergetrees.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/mergetrees.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/mergetrees.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/mergetrees.py Thu Feb 12 12:21:31 2015
@@ -122,7 +122,7 @@ def check_mergeinfo_recursively(root_pat
expected = verify.UnorderedOutput(
[path + ' - ' + subpaths_mergeinfo[path] + '\n'
for path in subpaths_mergeinfo])
- actions.run_and_verify_svn(None, expected, [],
+ actions.run_and_verify_svn(expected, [],
'propget', '-R', SVN_PROP_MERGEINFO,
root_path)
@@ -146,7 +146,7 @@ def set_up_dir_replace(sbox):
new_file2 = os.path.join(foo_path, "new file 2")
# Make directory foo in F, and add some files within it.
- actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+ actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
main.file_append(new_file, "Initial text in new file.\n")
main.file_append(new_file2, "Initial text in new file 2.\n")
main.run_svn(None, "add", new_file)
@@ -223,7 +223,7 @@ def set_up_dir_replace(sbox):
None, wc_dir)
# Delete foo on F, creating r4.
- actions.run_and_verify_svn(None, None, [], 'rm', foo_path)
+ actions.run_and_verify_svn(None, [], 'rm', foo_path)
expected_output = wc.State(wc_dir, {
'A/B/F/foo' : Item(verb='Deleting'),
})
@@ -327,7 +327,7 @@ def set_up_branch(sbox, branch_only = Fa
})
# Make a branch A_COPY to merge into.
- actions.run_and_verify_svn(None, expected, [], 'copy',
+ actions.run_and_verify_svn(expected, [], 'copy',
sbox.repo_url + "/A",
os.path.join(wc_dir,
dest_name))
@@ -400,22 +400,22 @@ def svn_mkfile(path):
dirname, filename = os.path.split(path)
main.file_write(path, "This is the file '" + filename + "'.\n" +
"Last changed in '$Revision$'.\n")
- actions.run_and_verify_svn(None, None, [], 'add', path)
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'add', path)
+ actions.run_and_verify_svn(None, [], 'propset',
'svn:keywords', 'Revision', path)
def svn_modfile(path):
"Make text and property mods to a WC file."
path = local_path(path)
main.file_append(path, "An extra line.\n")
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'propset',
'newprop', 'v', path)
def svn_copy(s_rev, path1, path2):
"Copy a WC path locally."
path1 = local_path(path1)
path2 = local_path(path2)
- actions.run_and_verify_svn(None, None, [], 'copy', '--parents',
+ actions.run_and_verify_svn(None, [], 'copy', '--parents',
'-r', s_rev, path1, path2)
def svn_merge(rev_range, source, target, lines=None, elides=[],
@@ -462,7 +462,7 @@ def svn_merge(rev_range, source, target,
text_resolved=text_resolved,
prop_resolved=prop_resolved,
tree_resolved=tree_resolved)
- actions.run_and_verify_svn(None, exp_out, [],
+ actions.run_and_verify_svn(exp_out, [],
'merge', rev_arg, source, target, *args)
#----------------------------------------------------------------------
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/objects.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/objects.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/objects.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/objects.py Thu Feb 12 12:21:31 2015
@@ -156,7 +156,7 @@ class SvnRepository:
"""Run 'svnadmin dump' on the repository."""
exit_code, stdout, stderr = \
- actions.run_and_verify_svnadmin(None, None, None,
+ actions.run_and_verify_svnadmin(None, None,
'dump', self.repo_absdir)
ldumpfile = local_path(output_dir + "/svnadmin.dump")
main.file_write(ldumpfile, ''.join(stderr))
@@ -167,7 +167,7 @@ class SvnRepository:
make, and each directory is a path relative to the repository root,
neither starting nor ending with a slash."""
urls = [self.repo_url + '/' + dir for dir in dirs]
- actions.run_and_verify_svn(None, None, [],
+ actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'svn_mkdirs()', '--parents',
*urls)
self.head_rev += 1
@@ -207,7 +207,7 @@ class SvnWC:
def svn_mkdir(self, rpath):
lpath = local_path(rpath)
- actions.run_and_verify_svn(None, None, [], 'mkdir', lpath)
+ actions.run_and_verify_svn(None, [], 'mkdir', lpath)
self.state.add({
rpath : wc.StateItem(status='A ')
@@ -216,7 +216,7 @@ class SvnWC:
# def propset(self, pname, pvalue, *rpaths):
# "Set property 'pname' to value 'pvalue' on each path in 'rpaths'"
# local_paths = tuple([local_path(rpath) for rpath in rpaths])
-# actions.run_and_verify_svn(None, None, [], 'propset', pname, pvalue,
+# actions.run_and_verify_svn(None, [], 'propset', pname, pvalue,
# *local_paths)
def svn_set_props(self, rpath, props):
@@ -224,10 +224,10 @@ class SvnWC:
"""
lpath = local_path(rpath)
#for prop in path's existing props:
- # actions.run_and_verify_svn(None, None, [], 'propdel',
+ # actions.run_and_verify_svn(None, [], 'propdel',
# prop, lpath)
for prop in props:
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'propset',
prop, props[prop], lpath)
self.state.tweak(rpath, props=props)
@@ -240,7 +240,7 @@ class SvnWC:
content = "This is the file '" + filename + "'.\n" + \
"Last changed in '$Revision$'.\n"
main.file_write(lpath, content)
- actions.run_and_verify_svn(None, None, [], 'add', lpath)
+ actions.run_and_verify_svn(None, [], 'add', lpath)
self.state.add({
rpath : wc.StateItem(status='A ')
@@ -257,7 +257,7 @@ class SvnWC:
lpath = local_path(rpath)
if content is not None:
#main.file_append(lpath, "An extra line.\n")
- #actions.run_and_verify_svn(None, None, [], 'propset',
+ #actions.run_and_verify_svn(None, [], 'propset',
# 'newprop', 'v', lpath)
main.file_write(lpath, content)
self.state.tweak(rpath, content=content)
@@ -274,7 +274,7 @@ class SvnWC:
args = [lpath1, lpath2]
if parents:
args += ['--parents']
- actions.run_and_verify_svn(None, None, [], 'copy', *args)
+ actions.run_and_verify_svn(None, [], 'copy', *args)
self.state.add({
rpath2: self.state.desc[rpath1]
})
@@ -292,7 +292,7 @@ class SvnWC:
args += ['-r', rev]
if parents:
args += ['--parents']
- actions.run_and_verify_svn(None, None, [], 'copy', *args)
+ actions.run_and_verify_svn(None, [], 'copy', *args)
self.state.add({
rpath2: self.state.desc[rpath1]
})
@@ -303,12 +303,12 @@ class SvnWC:
args = []
if even_if_modified:
args += ['--force']
- actions.run_and_verify_svn(None, None, [], 'delete', lpath, *args)
+ actions.run_and_verify_svn(None, [], 'delete', lpath, *args)
def svn_commit(self, rpath='', log=''):
"Commit a WC path (recursively). Return the new revision number."
lpath = local_path(rpath)
- actions.run_and_verify_svn(None, verify.AnyOutput, [],
+ actions.run_and_verify_svn(verify.AnyOutput, [],
'commit', '-m', log, lpath)
actions.run_and_verify_update(lpath, None, None, None)
self.repo.head_rev += 1
@@ -332,6 +332,6 @@ class SvnWC:
# exp_1 = "--- Merging r.* into '" + target_re + ".*':"
# exp_2 = "(A |D |[UG] | [UG]|[UG][UG]) " + target_re + ".*"
# exp_out = verify.RegexOutput(exp_1 + "|" + exp_2)
-# actions.run_and_verify_svn(None, exp_out, [],
+# actions.run_and_verify_svn(exp_out, [],
# 'merge', rev_spec, lsource, ltarget)