You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Paul Burba <pb...@collab.net> on 2007/08/02 14:56:35 UTC
RE: svn commit: r25837 - in trunk: subversion/mod_dav_svn tools/xslt
While testing a patch last night all the DAV tests failed on my Win32
box. I traced this failure back to r25837. All the tests fail when
performing the initial checkout, e.g.:
tail: dav-tests.log: file truncated
CMD: svnadmin.exe create "svn-test-work\local_tmp\repos"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.422000>
CMD: svn.exe import --username jrandom --password rayjandom -m "Log
message for revision 1." "svn-test-work\local_tmp\greekfiles" http://loc
alhost/svn-test-work/local_tmp/repos --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" <TIME =
1.406000>
CMD: svnadmin.exe create "svn-test-work\repositories\basic_tests-1"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.297000>
CMD: svnadmin.exe dump "svn-test-work\local_tmp\repos" | svnadmin.exe
load "svn-test-work\repositories\basic_tests-1" <TIME = 0.016000>
CMD: svn.exe co --username jrandom --password rayjandom
http://localhost/svn-test-work/repositories/basic_tests-1
"svn-test-work\working_cop
ies\basic_tests-1" --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" Interrupted
tail: dav-tests.log: file truncated
CMD: svnadmin.exe create "svn-test-work\local_tmp\repos"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.187000>
CMD: svn.exe import --username jrandom --password rayjandom -m "Log
message for revision 1." "svn-test-work\local_tmp\greekfiles" http://loc
alhost/svn-test-work/local_tmp/repos --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" <TIME =
1.063000>
CMD: svnadmin.exe create "svn-test-work\repositories\basic_tests-1"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.172000>
CMD: svnadmin.exe dump "svn-test-work\local_tmp\repos" | svnadmin.exe
load "svn-test-work\repositories\basic_tests-1" <TIME = 0.031000>
CMD: svn.exe co --username jrandom --password rayjandom
http://localhost/svn-test-work/repositories/basic_tests-1
"svn-test-work\working_cop
ies\basic_tests-1" --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" Interrupted
tail: dav-tests.log: file truncated
CMD: svnadmin.exe create "svn-test-work\local_tmp\repos"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.734000>
CMD: svn.exe import --username jrandom --password rayjandom -m "Log
message for revision 1." "svn-test-work\local_tmp\greekfiles" http://loc
alhost/svn-test-work/local_tmp/repos --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" <TIME =
1.641000>
CMD: svnadmin.exe create "svn-test-work\repositories\basic_tests-1"
--bdb-txn-nosync "--fs-type=fsfs" <TIME = 1.375000>
CMD: svnadmin.exe dump "svn-test-work\local_tmp\repos" | svnadmin.exe
load "svn-test-work\repositories\basic_tests-1" <TIME = 0.031000>
CMD: svn.exe co --username jrandom --password rayjandom
http://localhost/svn-test-work/repositories/basic_tests-1
"svn-test-work\working_cop
ies\basic_tests-1" --config-dir
"C:\SVN\src-trunk\Release\subversion\tests\cmdline\svn-test-work\local_t
mp\config" <TIME = 10.281000>
svn: REPORT request failed on
'/svn-test-work/repositories/basic_tests-1/!svn/vcc/default'
svn: REPORT of
'/svn-test-work/repositories/basic_tests-1/!svn/vcc/default': Could not
read status line: An existing connection was forcibly
closed by the remote host. (http://localhost)
FAIL: basic_tests.py 1: basic checkout of a wc
END: basic_tests.py
Before proceeding any further I wanted to know if anyone else is having
similar problems on Win32 (or any other platform)?
Paul
P.S. Also see comment below:
> -----Original Message-----
> From: cmpilato@tigris.org [mailto:cmpilato@tigris.org]
> Sent: Wednesday, July 25, 2007 4:04 PM
> To: svn@subversion.tigris.org
> Subject: svn commit: r25837 - in trunk:
> subversion/mod_dav_svn tools/xslt
>
> Author: cmpilato
> Date: Wed Jul 25 13:04:12 2007
> New Revision: 25837
>
> Log:
> Add support for displaying the repository's basename in the
> mod_dav_svn XML index view.
>
> * subversion/mod_dav_svn/dav_svn.h
> (dav_svn_repos): Add new 'repo_basename' member.
>
> * subversion/mod_dav_svn/repos.c
> (get_resource): Populate dav_svn_repos's new 'repo_basename' member.
> (deliver): Provide new 'repo_basename' value in XML output.
>
> * tools/xslt/svnindex.xsl
> Update to handle display of the repository basename.
>
> Patch by: Cliff Stanford <cl...@may.be>
>
> Modified:
> trunk/subversion/mod_dav_svn/dav_svn.h
> trunk/subversion/mod_dav_svn/repos.c
> trunk/tools/xslt/svnindex.xsl
>
> Modified: trunk/subversion/mod_dav_svn/dav_svn.h
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/
> dav_svn.h?pathrev=25837&r1=25836&r2=25837
> ==============================================================
> ================
> --- trunk/subversion/mod_dav_svn/dav_svn.h (original)
> +++ trunk/subversion/mod_dav_svn/dav_svn.h Wed Jul 25 13:04:12 2007
> @@ -93,6 +93,9 @@
> /* The name of this repository */
> const char *repo_name;
>
> + /* The repository filesystem basename */ const char
> *repo_basename;
> +
> /* The URI of the XSL transform for directory indexes */
> const char *xslt_uri;
>
>
> Modified: trunk/subversion/mod_dav_svn/repos.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/mod_dav_svn/
> repos.c?pathrev=25837&r1=25836&r2=25837
> ==============================================================
> ================
> --- trunk/subversion/mod_dav_svn/repos.c (original)
> +++ trunk/subversion/mod_dav_svn/repos.c Wed Jul 25 13:04:12 2007
> @@ -1569,6 +1569,9 @@
> /* A name for the repository */
> repos->repo_name = repo_name;
>
> + /* The repository filesystem basename */ repos->repo_basename =
> + repos_name;
> +
> /* An XSL transformation */
> repos->xslt_uri = xslt_uri;
>
> @@ -2593,7 +2596,8 @@
> " <!ELEMENT index (updir?, (file | dir)*)>\n"
> " <!ATTLIST index name CDATA #IMPLIED\n"
> " path CDATA #IMPLIED\n"
> - " rev CDATA #IMPLIED>\n"
> + " rev CDATA #IMPLIED\n"
> + " base CDATA #IMPLIED>\n"
> " <!ELEMENT updir EMPTY>\n"
> " <!ELEMENT file EMPTY>\n"
> " <!ATTLIST file name CDATA #REQUIRED\n"
> @@ -2692,6 +2696,7 @@
> {
> const char *name = resource->info->repos->repo_name;
> const char *href = resource->info->repos_path;
> + const char *base = resource->info->repos->repo_basename;
>
> ap_fputs(output, bb, "<?xml version=\"1.0\"?>\n");
> ap_fprintf(output, bb,
> @@ -2713,6 +2718,9 @@
> apr_xml_quote_string(resource->pool,
> href,
> 1));
> + if (base)
> + ap_fprintf(output, bb, " base=\"%s\"", base);
> +
On a hunch I used apr_xml_quote_string() on BASE, it seems consistent
with what we do with the other strings, but that didn't change anything.
> ap_fputs(output, bb, ">\n");
> }
>
>
> Modified: trunk/tools/xslt/svnindex.xsl
> URL:
> http://svn.collab.net/viewvc/svn/trunk/tools/xslt/svnindex.xsl
> ?pathrev=25837&r1=25836&r2=25837
> ==============================================================
> ================
> --- trunk/tools/xslt/svnindex.xsl (original)
> +++ trunk/tools/xslt/svnindex.xsl Wed Jul 25 13:04:12 2007
> @@ -42,13 +42,17 @@
>
> <xsl:template match="index">
> <div class="rev">
> - <xsl:if test="string-length(@name) != 0">
> - <xsl:value-of select="@name"/>
> - <xsl:if test="string-length(@rev) != 0">
> - <xsl:text> — </xsl:text>
> + <xsl:value-of select="@name"/>
> + <xsl:if test="@base">
> + <xsl:if test="@name">
> + <xsl:text>:  </xsl:text>
> </xsl:if>
> + <xsl:value-of select="@base" />
> </xsl:if>
> - <xsl:if test="string-length(@rev) != 0">
> + <xsl:if test="@rev">
> + <xsl:if test="@base | @name">
> + <xsl:text> — </xsl:text>
> + </xsl:if>
> <xsl:text>Revision </xsl:text>
> <xsl:value-of select="@rev"/>
> </xsl:if>
> @@ -70,7 +74,6 @@
> </xsl:element>
> <xsl:text>]</xsl:text>
> </div>
> - <!-- xsl:apply-templates/ -->
> </xsl:template>
>
> <xsl:template match="dir">
> @@ -83,7 +86,6 @@
> <xsl:text>/</xsl:text>
> </xsl:element>
> </div>
> - <!-- <xsl:apply-templates/ -->
> </xsl:template>
>
> <xsl:template match="file">
> @@ -95,7 +97,6 @@
> <xsl:value-of select="@name"/>
> </xsl:element>
> </div>
> - <!-- xsl:apply-templates/ -->
> </xsl:template>
>
> </xsl:stylesheet>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r25837 - in trunk: subversion/mod_dav_svn tools/xslt
Posted by "D.J. Heap" <dj...@gmail.com>.
On 8/4/07, Malcolm Rowe <ma...@farside.org.uk> wrote:
> On Sat, Aug 04, 2007 at 06:01:57AM -0600, D.J. Heap wrote:
> > I did find that running the dav tests in parallel doesn't work -- I
> > had errors like 'representation already being written by this process'
> > (sorry, lost the original error message) and a hang somewhere in
> > commit_tests. However, I'm not sure if they are known to work in
> > parallel on ra_dav? If they should work then I can re-run and provide
> > a log.
> >
>
> I think our tests might violate the constraint that the filesystem UUID
> is able to uniquely identify the filesystem from all those ever opened
> in the current process, hence the false-positive error message about
> representations you mentioned.
>
> Regards,
> Malcolm
>
Ah, that could explain that issue. To follow up, all the tests did
finish successfully for me when not run parallel.
DJ
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r25837 - in trunk: subversion/mod_dav_svn
tools/xslt
Posted by Malcolm Rowe <ma...@farside.org.uk>.
On Sat, Aug 04, 2007 at 06:01:57AM -0600, D.J. Heap wrote:
> I did find that running the dav tests in parallel doesn't work -- I
> had errors like 'representation already being written by this process'
> (sorry, lost the original error message) and a hang somewhere in
> commit_tests. However, I'm not sure if they are known to work in
> parallel on ra_dav? If they should work then I can re-run and provide
> a log.
>
I think our tests might violate the constraint that the filesystem UUID
is able to uniquely identify the filesystem from all those ever opened
in the current process, hence the false-positive error message about
representations you mentioned.
Regards,
Malcolm
Re: svn commit: r25837 - in trunk: subversion/mod_dav_svn tools/xslt
Posted by "D.J. Heap" <dj...@gmail.com>.
On 8/2/07, Paul Burba <pb...@collab.net> wrote:
> While testing a patch last night all the DAV tests failed on my Win32
> box. I traced this failure back to r25837. All the tests fail when
> performing the initial checkout, e.g.:
I haven't finished running all the tests yet, but no failures so far
(basic, checkout, commit, update, switch, prop, and schedule tests
have all completed successfully). I'm using current trunk on Apache
2.0.58.
I did find that running the dav tests in parallel doesn't work -- I
had errors like 'representation already being written by this process'
(sorry, lost the original error message) and a hang somewhere in
commit_tests. However, I'm not sure if they are known to work in
parallel on ra_dav? If they should work then I can re-run and provide
a log.
DJ
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org