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/10/18 22:59:57 UTC
svn commit: r1709319 - /subversion/trunk/subversion/tests/svn_test_fs.c
Author: stefan2
Date: Sun Oct 18 20:59:57 2015
New Revision: 1709319
URL: http://svn.apache.org/viewvc?rev=1709319&view=rev
Log:
Fix test suite to consistenly apply FS configuration settings when
creating new repos. This fixes the FSX tests.
* subversion/tests/svn_test_fs.c
(svn_test__create_fs2): Apply the same config when reopening a FS
that we used to create it. That includes
cache settings, for instance.
Modified:
subversion/trunk/subversion/tests/svn_test_fs.c
Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1709319&r1=1709318&r2=1709319&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Sun Oct 18 20:59:57 2015
@@ -195,7 +195,7 @@ svn_test__create_fs2(svn_fs_t **fs_p,
SVN_ERR(maybe_install_fs_conf(*fs_p, opts, &must_reopen, pool));
if (must_reopen)
{
- SVN_ERR(svn_fs_open2(fs_p, name, NULL, pool, pool));
+ SVN_ERR(svn_fs_open2(fs_p, name, fs_config, pool, pool));
svn_fs_set_warning_func(*fs_p, fs_warning_handler, NULL);
}
Re: svn commit: r1709319 - /subversion/trunk/subversion/tests/svn_test_fs.c
Posted by Stefan Fuhrmann <st...@wandisco.com>.
On Mon, Oct 19, 2015 at 2:00 AM, Bert Huijben <be...@qqmail.nl> wrote:
>
>
> > -----Original Message-----
> > From: stefan2@apache.org [mailto:stefan2@apache.org]
> > Sent: zondag 18 oktober 2015 23:00
> > To: commits@subversion.apache.org
> > Subject: svn commit: r1709319 -
> > /subversion/trunk/subversion/tests/svn_test_fs.c
> >
> > Author: stefan2
> > Date: Sun Oct 18 20:59:57 2015
> > New Revision: 1709319
> >
> > URL: http://svn.apache.org/viewvc?rev=1709319&view=rev
> > Log:
> > Fix test suite to consistenly apply FS configuration settings when
> > creating new repos. This fixes the FSX tests.
> >
> > * subversion/tests/svn_test_fs.c
> > (svn_test__create_fs2): Apply the same config when reopening a FS
> > that we used to create it. That includes
> > cache settings, for instance.
>
> Shouldn't it read that setting from the config that we created a few lines
> above?
>
Nope, those are different things (but easily confused).
The thing copied by maybe_install_fs_conf is fs*.conf.
Its contents will always be read and used by fs_open.
The fs_config hash represents the server / UI parameters
(cache settings in particular).
-- Stefan^2.
RE: svn commit: r1709319 - /subversion/trunk/subversion/tests/svn_test_fs.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: stefan2@apache.org [mailto:stefan2@apache.org]
> Sent: zondag 18 oktober 2015 23:00
> To: commits@subversion.apache.org
> Subject: svn commit: r1709319 -
> /subversion/trunk/subversion/tests/svn_test_fs.c
>
> Author: stefan2
> Date: Sun Oct 18 20:59:57 2015
> New Revision: 1709319
>
> URL: http://svn.apache.org/viewvc?rev=1709319&view=rev
> Log:
> Fix test suite to consistenly apply FS configuration settings when
> creating new repos. This fixes the FSX tests.
>
> * subversion/tests/svn_test_fs.c
> (svn_test__create_fs2): Apply the same config when reopening a FS
> that we used to create it. That includes
> cache settings, for instance.
Shouldn't it read that setting from the config that we created a few lines above?
Bert
>
> Modified:
> subversion/trunk/subversion/tests/svn_test_fs.c
>
> Modified: subversion/trunk/subversion/tests/svn_test_fs.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test
> _fs.c?rev=1709319&r1=1709318&r2=1709319&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/tests/svn_test_fs.c (original)
> +++ subversion/trunk/subversion/tests/svn_test_fs.c Sun Oct 18 20:59:57
> 2015
> @@ -195,7 +195,7 @@ svn_test__create_fs2(svn_fs_t **fs_p,
> SVN_ERR(maybe_install_fs_conf(*fs_p, opts, &must_reopen, pool));
> if (must_reopen)
> {
> - SVN_ERR(svn_fs_open2(fs_p, name, NULL, pool, pool));
> + SVN_ERR(svn_fs_open2(fs_p, name, fs_config, pool, pool));
> svn_fs_set_warning_func(*fs_p, fs_warning_handler, NULL);
> }
>
>