RE: [PATCH] New XFail test for issue 3781
Thanks Prabhu committed your patch in r1068802. With regards Kamesh Jayachandran -Original Message- From: Prabhu Gnana Sundar Ponnarasu Sent: Wed 2/9/2011 2:30 PM To: Bert Huijben Cc: Kamesh Jayachandran; dev@subversion.apache.org Subject: Re: [PATCH] New XFail test for issue 3781 Hi Bert, The problem was that my patch handled the expected error more specifically and also failed to handle the svnserve case. That was wrong on my part. I have tweaked the test case and attached a patch and log message with this mail. Please share your views on the same. On Tuesday 08 February 2011 09:08 PM, Bert Huijben wrote: > This test XFails for the wrong reason on svn://. > > EXPECTED STDERR (regexp): > svn: E175013: Unable to connect to a repository at URL > 'svn://localhost/svn-test-work/repositories/authz_tests-20/A/mu' > svn: E175013: Access to '/svn-test-work\repositories\authz_tests-20/A/mu' > forbidden > svn: E175009: XML parsing failed: (403 Forbidden) > ACTUAL STDERR: > ..\..\..\subversion\svn\cat-cmd.c:81: (apr_err=170001) > ..\..\..\subversion\svn\util.c:967: (apr_err=170001) > ..\..\..\subversion\libsvn_client\cat.c:233: (apr_err=170001) > ..\..\..\subversion\libsvn_ra_svn\client.c:1557: (apr_err=170001) > ..\..\..\subversion\libsvn_ra_svn\client.c:242: (apr_err=170001) > ..\..\..\subversion\svnserve\serve.c:174: (apr_err=170001) > svn: E170001: Authorization failed > EXCEPTION: SVNUnmatchedError > > See http://subversion.apache.org/buildbot/ or more specifically > http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/1675/steps/Test%20 > fsfs%2Bsvn/logs/testlog > > Bert > Thanks and regards Prabhu
Re: [PATCH] New XFail test for issue 3781
Hi Bert,
The problem was that my patch handled the expected error more
specifically and also failed to handle the svnserve case. That was wrong
on my part. I have tweaked the test case and attached a patch and log
message with this mail.
Please share your views on the same.
On Tuesday 08 February 2011 09:08 PM, Bert Huijben wrote:
This test XFails for the wrong reason on svn://.
EXPECTED STDERR (regexp):
svn: E175013: Unable to connect to a repository at URL
'svn://localhost/svn-test-work/repositories/authz_tests-20/A/mu'
svn: E175013: Access to '/svn-test-work\repositories\authz_tests-20/A/mu'
forbidden
svn: E175009: XML parsing failed: (403 Forbidden)
ACTUAL STDERR:
..\..\..\subversion\svn\cat-cmd.c:81: (apr_err=170001)
..\..\..\subversion\svn\util.c:967: (apr_err=170001)
..\..\..\subversion\libsvn_client\cat.c:233: (apr_err=170001)
..\..\..\subversion\libsvn_ra_svn\client.c:1557: (apr_err=170001)
..\..\..\subversion\libsvn_ra_svn\client.c:242: (apr_err=170001)
..\..\..\subversion\svnserve\serve.c:174: (apr_err=170001)
svn: E170001: Authorization failed
EXCEPTION: SVNUnmatchedError
See http://subversion.apache.org/buildbot/ or more specifically
http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/1675/steps/Test%20
fsfs%2Bsvn/logs/testlog
Bert
Thanks and regards
Prabhu
[[[
XFail testcase for the issue 3781
* subversion/tests/cmdline/authz_tests.py
(case_sensitive_authz): Now handles the svnserve errors too. Till now the expected error was more specific to the http protocol.
Patch by: Prabhu Gnana Sundar
Reviewed by: Kamesh Jayachandran
]]]
Index: subversion/tests/cmdline/authz_tests.py
===
--- subversion/tests/cmdline/authz_tests.py (revision 1068769)
+++ subversion/tests/cmdline/authz_tests.py (working copy)
@@ -1107,12 +1107,12 @@
# error messages
expected_error_for_commit = "Commit failed"
- expected_error_for_cat = "svn: E175013: Unable to connect to a repository"+ \
-" at URL '" + mu_url + "'\n" + \
-"svn: E175013: Access to '/" + mu_repo_path + \
-"' forbidden\n" + \
-"svn: E175009: XML parsing failed: (403 Forbidden)"
+ if sbox.repo_url.startswith("http"):
+expected_error_for_cat = ".*[Ff]orbidden.*"
+ else:
+expected_error_for_cat = ".*svn: E170001: Authorization failed.*"
+
# test the case-sensitivity of the path inside the repo
write_authz_file(sbox, {"/": "jrandom = r",
"/A/mu": "jrandom =", "/a/Mu": "jrandom = rw"})
RE: [PATCH] New XFail test for issue 3781
> -Original Message-
> From: Kamesh Jayachandran [mailto:kam...@collab.net]
> Sent: dinsdag 8 februari 2011 15:30
> To: Prabhu Gnana Sundar Ponnarasu
> Cc: dev@subversion.apache.org
> Subject: RE: [PATCH] New XFail test for issue 3781
>
>
> Thanks Prabhu.
>
> I committed with the following tweaks in r1068411.
>
> 1. Added @XFail(), @Issue(3781) decorators
> 2.
>
> + # test the case-sensitivity of the repo name
> + write_authz_file(sbox, {},
> + sections = {mixed_case_repo_dir + ":/": "jrandom =
> r",
> + mixed_case_repo_dir + ":/A": "jrandom =
> r",
> + sbox.repo_dir + ":/A/mu": "jrandom =",
> + mixed_case_repo_dir + ":/A/mu":
> "jrandom = rw"})
>
> Replaced this snippet by the following snippet.
> + # test the case-sensitivity of the repo name
> + sec_mixed_case = {mixed_case_repo_dir + ":/": "jrandom = r",
> +mixed_case_repo_dir + ":/A": "jrandom = r",
> +os.path.basename(sbox.repo_dir) + ":/A/mu":
> "jrandom =",
> +mixed_case_repo_dir + ":/A/mu": "jrandom = rw"}
> + write_authz_file(sbox, {}, sec_mixed_case)
>
>
> You can reduce this to simpler one as most of the time same 'cat' and
> 'commit' is tested with one 'for' loop
> which iterates over [(rule1, section1), (rule2, section2)...]
This test XFails for the wrong reason on svn://.
EXPECTED STDERR (regexp):
svn: E175013: Unable to connect to a repository at URL
'svn://localhost/svn-test-work/repositories/authz_tests-20/A/mu'
svn: E175013: Access to '/svn-test-work\repositories\authz_tests-20/A/mu'
forbidden
svn: E175009: XML parsing failed: (403 Forbidden)
ACTUAL STDERR:
..\..\..\subversion\svn\cat-cmd.c:81: (apr_err=170001)
..\..\..\subversion\svn\util.c:967: (apr_err=170001)
..\..\..\subversion\libsvn_client\cat.c:233: (apr_err=170001)
..\..\..\subversion\libsvn_ra_svn\client.c:1557: (apr_err=170001)
..\..\..\subversion\libsvn_ra_svn\client.c:242: (apr_err=170001)
..\..\..\subversion\svnserve\serve.c:174: (apr_err=170001)
svn: E170001: Authorization failed
EXCEPTION: SVNUnmatchedError
See http://subversion.apache.org/buildbot/ or more specifically
http://ci.apache.org/builders/svn-slik-w2k3-x64-ra/builds/1675/steps/Test%20
fsfs%2Bsvn/logs/testlog
Bert
RE: [PATCH] New XFail test for issue 3781
Thanks Prabhu.
I committed with the following tweaks in r1068411.
1. Added @XFail(), @Issue(3781) decorators
2.
+ # test the case-sensitivity of the repo name
+ write_authz_file(sbox, {},
+ sections = {mixed_case_repo_dir + ":/": "jrandom = r",
+ mixed_case_repo_dir + ":/A": "jrandom = r",
+ sbox.repo_dir + ":/A/mu": "jrandom =",
+ mixed_case_repo_dir + ":/A/mu": "jrandom = rw"})
Replaced this snippet by the following snippet.
+ # test the case-sensitivity of the repo name
+ sec_mixed_case = {mixed_case_repo_dir + ":/": "jrandom = r",
+mixed_case_repo_dir + ":/A": "jrandom = r",
+os.path.basename(sbox.repo_dir) + ":/A/mu": "jrandom =",
+mixed_case_repo_dir + ":/A/mu": "jrandom = rw"}
+ write_authz_file(sbox, {}, sec_mixed_case)
You can reduce this to simpler one as most of the time same 'cat' and 'commit'
is tested with one 'for' loop
which iterates over [(rule1, section1), (rule2, section2)...]
With regards
Kamesh Jayachandran
-Original Message-
From: Prabhu Gnana Sundar Ponnarasu
Sent: Tue 2/8/2011 6:23 PM
To: Kamesh Jayachandran
Cc: dev@subversion.apache.org
Subject: Re: [PATCH] New XFail test for issue 3781
Hi,
Sorry for posting an older patch. Now attached the correct patch.
Please share your views.
Thanks and regards
Prabhu
On Tuesday 08 February 2011 04:41 PM, Kamesh Jayachandran wrote:
>
> Prabhu,
>
>
> Please send the patch against the current HEAD.
>
> With regards
> Kamesh Jayachandran
>
Re: [PATCH] New XFail test for issue 3781
Hi,
Sorry for posting an older patch. Now attached the correct patch.
Please share your views.
Thanks and regards
Prabhu
On Tuesday 08 February 2011 04:41 PM, Kamesh Jayachandran wrote:
Prabhu,
Please send the patch against the current HEAD.
With regards
Kamesh Jayachandran
Index: subversion/tests/cmdline/authz_tests.py
===
--- subversion/tests/cmdline/authz_tests.py (revision 1068337)
+++ subversion/tests/cmdline/authz_tests.py (working copy)
@@ -1084,6 +1084,99 @@
[], 'ls', '-R',
sbox.repo_url)
+@Skip(svntest.main.is_ra_type_file)
+def case_sensitive_authz(sbox):
+ "authz issue #3781, check case sensitiveness"
+
+ sbox.build()
+
+ wc_dir = sbox.wc_dir
+ write_restrictive_svnserve_conf(sbox.repo_dir)
+
+ mu_path = os.path.join(wc_dir, 'A', 'mu')
+ mu_url = sbox.repo_url + '/A/mu'
+ mu_repo_path = sbox.repo_dir + "/A/mu"
+ svntest.main.file_append(mu_path, "hi")
+
+ # Create expected output tree.
+ expected_output = svntest.wc.State(wc_dir, {
+'A/mu' : Item(verb='Sending'),
+})
+
+ # error messages
+ expected_error_for_commit = "Commit failed"
+ expected_error_for_cat = "svn: E175013: Unable to connect to a repository"+ \
+" at URL '" + mu_url + "'\n" + \
+"svn: E175013: Access to '/" + mu_repo_path + \
+"' forbidden\n" + \
+"svn: E175009: XML parsing failed: (403 Forbidden)"
+
+ # test the case-sensitivity of the path inside the repo
+ write_authz_file(sbox, {"/": "jrandom = r",
+ "/A/mu": "jrandom =", "/a/Mu": "jrandom = rw"})
+ svntest.actions.run_and_verify_svn2(None, None,
+ expected_error_for_cat,
+ 1, 'cat', mu_url)
+
+ write_authz_file(sbox, {"/": "jrandom = r",
+ "/A": "jrandom = r",
+ "/a/Mu": "jrandom = rw"})
+ # Commit the file.
+ svntest.actions.run_and_verify_commit(wc_dir,
+None,
+None,
+expected_error_for_commit,
+mu_path)
+
+ def mixcases(repo_name):
+mixed_repo_name = ''
+for i in range(0, len(repo_name)):
+ if i % 2 == 0:
+mixed_val = repo_name[i].upper()
+mixed_repo_name = mixed_repo_name + mixed_val
+ else:
+mixed_val = repo_name[i].lower()
+mixed_repo_name = mixed_repo_name + mixed_val
+return mixed_repo_name
+
+ mixed_case_repo_dir = mixcases(os.path.basename(sbox.repo_dir))
+
+ # test the case-sensitivity of the repo name
+ write_authz_file(sbox, {},
+ sections = {mixed_case_repo_dir + ":/": "jrandom = r",
+ mixed_case_repo_dir + ":/A": "jrandom = r",
+ sbox.repo_dir + ":/A/mu": "jrandom =",
+ mixed_case_repo_dir + ":/A/mu": "jrandom = rw"})
+ svntest.actions.run_and_verify_svn2(None, None,
+ expected_error_for_cat,
+ 1, 'cat', mu_url)
+
+ write_authz_file(sbox, {},
+ sections = {mixed_case_repo_dir + ":/": "jrandom = r",
+ mixed_case_repo_dir + ":/A": "jrandom = r",
+ mixed_case_repo_dir + ":/A/mu": "jrandom = rw"})
+
+ # Commit the file again.
+ svntest.actions.run_and_verify_commit(wc_dir,
+None,
+None,
+expected_error_for_commit,
+mu_path)
+
+ # test the case-sensitivity
+ write_authz_file(sbox, {"/": "jrandom = r",
+ "/A": "jrandom = r", "/A/mu": "jrandom = rw"})
+
+ svntest.actions.run_and_verify_svn2('No error',
+ svntest.verify.AnyOutput, [],
+ 0, 'cat', mu_url)
+ # Commit the file.
+ svntest.actions.run_and_verify_commit(wc_dir,
+expected_output,
+None,
+None,
+mu_path)
+
# Run the tests
@@ -1108,6 +1201,7 @@
multiple_matches,
wc_wc_copy_revert,
authz_recursive_ls,
+ case_sensitive_authz,
]
serial_only = True
[[[
XFail testcase for the issue 3781
* subversion/tests/cmdline/authz_tests.py
(case_sensitive_authz, test_list): New XFail test for the issue 3781
Patch by: Prabhu Gnana Sundar
Reviewed b
RE: [PATCH] New XFail test for issue 3781
Prabhu, Please send the patch against the current HEAD. With regards Kamesh Jayachandran -Original Message- From: Prabhu Gnana Sundar Ponnarasu Sent: Tue 2/8/2011 1:11 PM To: Kamesh Jayachandran Cc: dev@subversion.apache.org Subject: [PATCH] New XFail test for issue 3781 Hi Kamesh, I have created a new thread in order to prevent the confusion about the test case. I have tweaked the test case as you mentioned in the previous thread. Here is the link for the same... http://mail-archives.apache.org/mod_mbox/subversion-dev/201102.mbox/%3c0213965108dead48960ce83455e07dff0192b...@maa-exchmb.maa.corp.collab.net%3E Thank you for your valuable suggestions. I hope this test case would make things a bit more clear. I have attached the patch and the log message with this mail. Please share your views. Thanks and regards Prabhu
