You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/11/13 21:24:35 UTC
svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline:
basic_tests.py davautocheck.sh svntest/main.py
Author: brane
Date: Thu Nov 13 20:24:35 2014
New Revision: 1639507
URL: http://svn.apache.org/r1639507
Log:
Mark basic_tests.py 38 as XFAIL if running DAV tests with a version of
HTTPd where mod_dav has an URL quoting bug.
See: https://issues.apache.org/bugzilla/show_bug.cgi?id=56480
* subversion/tests/cmdline/davautocheck.sh:
Parse and export the HTTPd versions.
* subversion/tests/cmdline/svntest/main.py
(__mod_dav_url_quoting_broken_versions): New; the list of HTTPd versions
where mod_dav is known to have the bug described in PR 56480
(is_mod_dav_url_quoting_broken): New predicate.
* subversion/tests/cmdline/basic_tests.py
(special_paths_in_repos): Tag as XFail with the new predicate.
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1639507&r1=1639506&r2=1639507&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Thu Nov 13 20:24:35 2014
@@ -2003,6 +2003,7 @@ def delete_keep_local_twice(sbox):
logger.warn('Directory was really deleted')
raise svntest.Failure
+@XFail(svntest.main.is_mod_dav_url_quoting_broken)
def special_paths_in_repos(sbox):
"use folders with names like 'c:hi'"
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1639507&r1=1639506&r2=1639507&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Thu Nov 13 20:24:35 2014
@@ -264,7 +264,10 @@ HTTPD=$(get_prog_name $httpd) || fail "H
"$HTTPD" -v 1>/dev/null 2>&1 \
|| fail "HTTPD '$HTTPD' doesn't start properly"
-say "Using '$HTTPD'..."
+SVNTEST_HTTPD_VERSION="`$HTTPD -v | head -1 | sed -e 's@^.*/\([0-9.]*\).*$@\1@'`"
+
+say "Using '$HTTPD', version $SVNTEST_HTTPD_VERSION..."
+export SVNTEST_HTTPD_VERSION
HTPASSWD=$(get_prog_name htpasswd htpasswd2) \
|| fail "Could not find htpasswd or htpasswd2"
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1639507&r1=1639506&r2=1639507&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Nov 13 20:24:35 2014
@@ -1465,6 +1465,18 @@ def is_plaintext_password_storage_disabl
return False
return True
+
+# https://issues.apache.org/bugzilla/show_bug.cgi?id=56480
+__mod_dav_url_quoting_broken_versions = frozenset([
+ '2.2.26',
+ '2.4.9',
+])
+def is_mod_dav_url_quoting_broken():
+ if is_ra_type_dav():
+ httpd_version = os.environ['SVNTEST_HTTPD_VERSION']
+ return (httpd_version in __mod_dav_url_quoting_broken_versions)
+ return None
+
######################################################################
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline:
basic_tests.py davautocheck.sh svntest/main.py
Posted by Branko Čibej <br...@wandisco.com>.
On 14.11.2014 15:09, Philip Martin wrote:
> Branko Čibej <br...@wandisco.com> writes:
>
>> On 14.11.2014 14:47, Philip Martin wrote:
>>> Philip Martin <ph...@wandisco.com> writes:
>>>
>>>> Perhaps we could move the code from davautocheck.sh to apache.m4. Have
>>>> apache.m4 set a make variable containing the version number and add a
>>>> make rule to export the value of the make variable in an environment
>>>> variable.
>>> I did it slightly differently by introducing an --httpd-version option
>>> as this is how most of the other testuite options work.
>> How will this work for testing installed binaries?
> I don't understand the question. configure runs 'httpd -v' so apache
> needs to be installed. Is it possible to build Subversion against an
> apache that is not installed? Or do you mean building Subversion
> against one installed version of apache and then running the tests
> against some other installed version?
The latter. Or, for example, installing HTTPd and Subversion from a
package, then using our test suite to run tests against that.
But I just realized that you'd have to run configure for that to work,
too. So, never mind me.
-- Brane
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline: basic_tests.py davautocheck.sh svntest/main.py
Posted by Philip Martin <ph...@wandisco.com>.
Branko Čibej <br...@wandisco.com> writes:
> On 14.11.2014 14:47, Philip Martin wrote:
>> Philip Martin <ph...@wandisco.com> writes:
>>
>>> Perhaps we could move the code from davautocheck.sh to apache.m4. Have
>>> apache.m4 set a make variable containing the version number and add a
>>> make rule to export the value of the make variable in an environment
>>> variable.
>> I did it slightly differently by introducing an --httpd-version option
>> as this is how most of the other testuite options work.
>
> How will this work for testing installed binaries?
I don't understand the question. configure runs 'httpd -v' so apache
needs to be installed. Is it possible to build Subversion against an
apache that is not installed? Or do you mean building Subversion
against one installed version of apache and then running the tests
against some other installed version?
--
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline:
basic_tests.py davautocheck.sh svntest/main.py
Posted by Branko Čibej <br...@wandisco.com>.
On 14.11.2014 14:47, Philip Martin wrote:
> Philip Martin <ph...@wandisco.com> writes:
>
>> Perhaps we could move the code from davautocheck.sh to apache.m4. Have
>> apache.m4 set a make variable containing the version number and add a
>> make rule to export the value of the make variable in an environment
>> variable.
> I did it slightly differently by introducing an --httpd-version option
> as this is how most of the other testuite options work.
How will this work for testing installed binaries?
-- Brane
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline: basic_tests.py davautocheck.sh svntest/main.py
Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:
> Perhaps we could move the code from davautocheck.sh to apache.m4. Have
> apache.m4 set a make variable containing the version number and add a
> make rule to export the value of the make variable in an environment
> variable.
I did it slightly differently by introducing an --httpd-version option
as this is how most of the other testuite options work.
--
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline: basic_tests.py davautocheck.sh svntest/main.py
Posted by Philip Martin <ph...@wandisco.com>.
Branko Čibej <br...@wandisco.com> writes:
> On 13.11.2014 21:24, brane@apache.org wrote:
>> Author: brane
>> Date: Thu Nov 13 20:24:35 2014
>> New Revision: 1639507
>>
>> URL: http://svn.apache.org/r1639507
>> Log:
>> Mark basic_tests.py 38 as XFAIL if running DAV tests with a version of
>> HTTPd where mod_dav has an URL quoting bug.
>>
>> See: https://issues.apache.org/bugzilla/show_bug.cgi?id=56480
>
> Hey Ben,
>
> You fixed this issue in mod_dav. Could you take a minute to review this,
> please, especially the list of broken HTTPd versions? It appears that
> both OSX 10.8 and 10.10 ship a system HTTPd that has this bug, so I
> think it's useful to have this predicate in our test suite.
One problem is the inconsistent handling of the broken httpd versions.
Using 2.2.25, 2.4.5 and 2.4.6 leads to a build failure while running
configure. Using 2.2.26 and 2.4.9 allows the build but raises a runtime
XFAIL. I'm not sure how Subversion should handle a broken Apache; if
the user has an old Subversion installed, one that did not do the
detection, should we stop upgrades to a newer Subversion with security
fixes?
Putting the code in davautocheck.sh means that it triggers for
make davautocheck
but not for
make check BASE_URL=http://...
Perhaps we could move the code from davautocheck.sh to apache.m4. Have
apache.m4 set a make variable containing the version number and add a
make rule to export the value of the make variable in an environment
variable.
--
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Re: svn commit: r1639507 - in /subversion/trunk/subversion/tests/cmdline:
basic_tests.py davautocheck.sh svntest/main.py
Posted by Branko Čibej <br...@wandisco.com>.
On 13.11.2014 21:24, brane@apache.org wrote:
> Author: brane
> Date: Thu Nov 13 20:24:35 2014
> New Revision: 1639507
>
> URL: http://svn.apache.org/r1639507
> Log:
> Mark basic_tests.py 38 as XFAIL if running DAV tests with a version of
> HTTPd where mod_dav has an URL quoting bug.
>
> See: https://issues.apache.org/bugzilla/show_bug.cgi?id=56480
Hey Ben,
You fixed this issue in mod_dav. Could you take a minute to review this,
please, especially the list of broken HTTPd versions? It appears that
both OSX 10.8 and 10.10 ship a system HTTPd that has this bug, so I
think it's useful to have this predicate in our test suite.
-- Brane