You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <rh...@sharpsvn.net> on 2009/09/05 14:20:03 UTC

RE: svn commit: r39149 - trunk/subversion/tests/cmdline

> -----Original Message-----
> From: Daniel Shahaf [mailto:tigris@danielsh.fastmail.net]
> Sent: zaterdag 5 september 2009 8:34
> To: svn@subversion.tigris.org
> Subject: svn commit: r39149 - trunk/subversion/tests/cmdline
> 
> Author: danielsh
> Date: Fri Sep  4 23:34:24 2009
> New Revision: 39149
> 
> Log:
> Add a new test for the issue described in the '"svn up format9-wc"
> doesn't
> error' thread.
> 
> The new test is identical to the existing test 'upgrade_1_5' except
> that it
> runs 'update' instead of 'info'.
> 
> * subversion/tests/cmdline/upgrade_tests.py
>   (upgrade_1_5_body): Renamed from upgrade_1_5() and
>     make the subcommand a parameter.
>   (upgrade_1_5): Now just calls upgrade_1_5_body().
>   (update_1_5): New.
>   (test_list): Run the new test, XFail.
> 
> Modified:
>    trunk/subversion/tests/cmdline/upgrade_tests.py
> 
> Modified: trunk/subversion/tests/cmdline/upgrade_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/upgrade
> _tests.py?pathrev=39149&r1=39148&r2=39149
> =======================================================================
> =======
> --- trunk/subversion/tests/cmdline/upgrade_tests.py	Fri Sep  4
> 20:35:07 2009	(r39148)
> +++ trunk/subversion/tests/cmdline/upgrade_tests.py	Fri Sep  4
> 23:34:24 2009	(r39149)
> @@ -133,15 +133,13 @@ def basic_upgrade(sbox):
>    run_and_verify_status_no_server(sbox.wc_dir, expected_status)
> 
> 
> -def upgrade_1_5(sbox):
> -  "test upgrading from a 1.5-era working copy"
> -
> +def upgrade_1_5_body(sbox, subcommand):
>    replace_sbox_with_tarfile(sbox, 'upgrade_1_5.tar.bz2')
> 
>    # Attempt to use the working copy, this should give an error
>    expected_stderr = wc_is_too_old_regex
>    svntest.actions.run_and_verify_svn(None, None, expected_stderr,
> -                                     'info', sbox.wc_dir)
> +                                     subcommand, sbox.wc_dir)
> 
> 
>    # Now upgrade the working copy
> @@ -156,6 +154,21 @@ def upgrade_1_5(sbox):
>    run_and_verify_status_no_server(sbox.wc_dir, expected_status)
> 
> 
> +def upgrade_1_5(sbox):
> +  "test upgrading from a 1.5-era working copy"
> +  return upgrade_1_5_body(sbox, 'info')
> +
> +
> +def update_1_5(sbox):
> +  "test updating a 1.5-era working copy"
> +
> +  # The 'update' printed:
> +  #    Skipped 'svn-test-work\working_copies\upgrade_tests-3'
> +  #    Summary of conflicts:
> +  #      Skipped paths: 1
> +  return upgrade_1_5_body(sbox, 'update')
> +
> +
>  def logs_left_1_5(sbox):
>    "test upgrading from a 1.5-era wc with stale logs"
> 
> @@ -204,6 +217,7 @@ def has_sqlite():
>  test_list = [ None,
>                SkipUnless(basic_upgrade, has_sqlite),
>                SkipUnless(upgrade_1_5, has_sqlite),
> +              XFail(SkipUnless(update_1_5, has_sqlite)),
>                logs_left_1_5,
>                SkipUnless(upgrade_wcprops, has_sqlite),

It is impossible to have WC-NG without sqlite, so these has_sqlite checks
can be removed. The other checks were added when you could enable the NG
working copies with an environment variable.

	Bert

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391300

Re: svn commit: r39149 - trunk/subversion/tests/cmdline

Posted by Arfrever Frehtes Taifersar Arahesis <Ar...@GMail.Com>.
2009-09-05 16:20:03 Bert Huijben napisaƂ(a):
> > -----Original Message-----
> > From: Daniel Shahaf [mailto:tigris@danielsh.fastmail.net]
> > Sent: zaterdag 5 september 2009 8:34
> > To: svn@subversion.tigris.org
> > Subject: svn commit: r39149 - trunk/subversion/tests/cmdline
> > 
> > Author: danielsh
> > Date: Fri Sep  4 23:34:24 2009
> > New Revision: 39149
> > 
> > Log:
> > Add a new test for the issue described in the '"svn up format9-wc"
> > doesn't
> > error' thread.
> > 
> > The new test is identical to the existing test 'upgrade_1_5' except
> > that it
> > runs 'update' instead of 'info'.
> > 
> > * subversion/tests/cmdline/upgrade_tests.py
> >   (upgrade_1_5_body): Renamed from upgrade_1_5() and
> >     make the subcommand a parameter.
> >   (upgrade_1_5): Now just calls upgrade_1_5_body().
> >   (update_1_5): New.
> >   (test_list): Run the new test, XFail.
> > 
> > Modified:
> >    trunk/subversion/tests/cmdline/upgrade_tests.py
> > 
> > Modified: trunk/subversion/tests/cmdline/upgrade_tests.py
> > URL:
> > http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/upgrade
> > _tests.py?pathrev=39149&r1=39148&r2=39149
> > =======================================================================
> > =======
> > --- trunk/subversion/tests/cmdline/upgrade_tests.py	Fri Sep  4
> > 20:35:07 2009	(r39148)
> > +++ trunk/subversion/tests/cmdline/upgrade_tests.py	Fri Sep  4
> > 23:34:24 2009	(r39149)
> > @@ -133,15 +133,13 @@ def basic_upgrade(sbox):
> >    run_and_verify_status_no_server(sbox.wc_dir, expected_status)
> > 
> > 
> > -def upgrade_1_5(sbox):
> > -  "test upgrading from a 1.5-era working copy"
> > -
> > +def upgrade_1_5_body(sbox, subcommand):
> >    replace_sbox_with_tarfile(sbox, 'upgrade_1_5.tar.bz2')
> > 
> >    # Attempt to use the working copy, this should give an error
> >    expected_stderr = wc_is_too_old_regex
> >    svntest.actions.run_and_verify_svn(None, None, expected_stderr,
> > -                                     'info', sbox.wc_dir)
> > +                                     subcommand, sbox.wc_dir)
> > 
> > 
> >    # Now upgrade the working copy
> > @@ -156,6 +154,21 @@ def upgrade_1_5(sbox):
> >    run_and_verify_status_no_server(sbox.wc_dir, expected_status)
> > 
> > 
> > +def upgrade_1_5(sbox):
> > +  "test upgrading from a 1.5-era working copy"
> > +  return upgrade_1_5_body(sbox, 'info')
> > +
> > +
> > +def update_1_5(sbox):
> > +  "test updating a 1.5-era working copy"
> > +
> > +  # The 'update' printed:
> > +  #    Skipped 'svn-test-work\working_copies\upgrade_tests-3'
> > +  #    Summary of conflicts:
> > +  #      Skipped paths: 1
> > +  return upgrade_1_5_body(sbox, 'update')
> > +
> > +
> >  def logs_left_1_5(sbox):
> >    "test upgrading from a 1.5-era wc with stale logs"
> > 
> > @@ -204,6 +217,7 @@ def has_sqlite():
> >  test_list = [ None,
> >                SkipUnless(basic_upgrade, has_sqlite),
> >                SkipUnless(upgrade_1_5, has_sqlite),
> > +              XFail(SkipUnless(update_1_5, has_sqlite)),
> >                logs_left_1_5,
> >                SkipUnless(upgrade_wcprops, has_sqlite),
> 
> It is impossible to have WC-NG without sqlite, so these has_sqlite checks
> can be removed.

has_sqlite() checks if Python has been built with support for SQLite.

-- 
Arfrever Frehtes Taifersar Arahesis

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2391305