subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <danie...@apache.org>
Subject Re: svn commit: r1496127 - /subversion/trunk/subversion/tests/cmdline/checkout_tests.py
Date Mon, 24 Jun 2013 17:56:57 GMT
On Mon, Jun 24, 2013 at 05:14:10PM -0000, philip@apache.org wrote:
> Author: philip
> Date: Mon Jun 24 17:14:10 2013
> New Revision: 1496127
> 
> URL: http://svn.apache.org/r1496127
> Log:
> Fix occasional failure of checkout_test.py 12 due to dropping the
> fractional seconds from the current time.
> 
> * subversion/tests/cmdline/checkout_tests.py
>   (checkout_peg_rev_date): Get svn:date revision property rather than
>    getting the current time.
> 
> Modified:
>     subversion/trunk/subversion/tests/cmdline/checkout_tests.py
> 
> Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=1496127&r1=1496126&r2=1496127&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Mon Jun 24 17:14:10 2013
> @@ -660,8 +660,13 @@ def checkout_peg_rev_date(sbox):
>    sbox.build()
>    wc_dir = sbox.wc_dir
>  
> -  # note the current time to use it as peg revision date.
> -  current_time = time.strftime("%Y-%m-%dT%H:%M:%S")
> +  exit_code, output, errput = svntest.main.run_svn(None, 'propget', 'svn:date',
> +                                                   '--revprop', '-r1',
> +                                                   '--strict',
> +                                                   sbox.repo_url)
> +  if exit_code or errput != [] or len(output) != 1:
> +    raise svntest.Failure("svn:date propget failed")
> +  r1_time = output[0]
>  
>    # sleep till the next second.
>    time.sleep(1.1)
> @@ -686,7 +691,7 @@ def checkout_peg_rev_date(sbox):
>  
>    # use an old date to checkout, that way we're sure we get the first revision
>    svntest.actions.run_and_verify_checkout(sbox.repo_url +
> -                                          '@{' + current_time + '}',
> +                                          '@{' + r1_time + '}',

This tests updating to a {time} equal to the svn:date property, shouldn't it
try updating to a slightly later time to test that resolution works in the
common case too?

Mime
View raw message