RE: svn commit: r1606743 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[Bert Huijben <be...@qqmail.nl>]

> -----Original Message-----
> From: stefan2@apache.org [mailto:stefan2@apache.org]
> Sent: maandag 30 juni 2014 15:58
> To: commits@subversion.apache.org
> Subject: svn commit: r1606743 - in
> /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py
> svntest/main.py
> 
> Author: stefan2
> Date: Mon Jun 30 13:57:52 2014
> New Revision: 1606743
> 
> URL: http://svn.apache.org/r1606743
> Log:
> Instead of manually fiddling with FSFS index data in our test suite,
> use the svnfsfs tool to read and rewrite the indexes after we manipulated
> the revision contents.
> 
> * subversion/tests/cmdline/svnadmin_tests.py
>   (FSFS_Index): New utility class handling all the index access.
>   (read_l2p): Drop obsolete utility.
>   (set_changed_path_list): Use the new class to read the index data and
>                            to keep it consistent with our manipulated
>                            rev content.
>   (verify_invalid_path_changes): Update expected errors as we don't get
>                                  low-level checksum mismatches anymore.

Some python versions used by our buildbot don't like the usage of the 'format()' function.

[[[
W: CWD: /home/bt/slaves/x64-centos/build/subversion/tests/cmdline
Traceback (most recent call last):
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/main.py", line 1634, in run
    rc = self.pred.run(sandbox)
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/testcase.py", line 254, in run
    return self._delegate.run(sandbox)
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svntest/testcase.py", line 176, in run
    return self.func(sandbox)
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svnadmin_tests.py", line 2150, in verify_invalid_path_changes
    "_0.0.t1-1 add-dir false false /A\n\n")
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svnadmin_tests.py", line 396, in set_changed_path_list
    idx.modify_item(1, offset, len(changes) + 1)
  File "/home/bt/slaves/x64-centos/build/subversion/tests/cmdline/svnadmin_tests.py", line 331, in modify_item
    values[0] = format(offset, 'x')
NameError: global name 'format' is not defined
FAIL:  svnadmin_tests.py 33: detect invalid changed path list entries
]]]

	Bert

Re: svn commit: r1606743 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[Ben Reser <be...@reser.org>]

On 6/30/14 8:09 AM, Ben Reser wrote:
> On 6/30/14 7:56 AM, Bert Huijben wrote:
>> Some python versions used by our buildbot don't like the usage of the 'format()' function.
> 
> Format was added in 2.6, we only require 2.5.  I'll commit a fix to use the old
> style formatting that is equivalent shortly.

Done in r1606770.

Re: svn commit: r1606743 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[Stefan Fuhrmann <st...@wandisco.com>]

On Mon, Jun 30, 2014 at 5:09 PM, Ben Reser <be...@reser.org> wrote:

> On 6/30/14 7:56 AM, Bert Huijben wrote:
> > Some python versions used by our buildbot don't like the usage of the
> 'format()' function.
>
> Format was added in 2.6, we only require 2.5.  I'll commit a fix to use
> the old
> style formatting that is equivalent shortly.
>

Thanks a lot, Ben!

-- Stefan^2.

Re: svn commit: r1606743 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/main.py

[Ben Reser <be...@reser.org>]

On 6/30/14 7:56 AM, Bert Huijben wrote:
> Some python versions used by our buildbot don't like the usage of the 'format()' function.

Format was added in 2.6, we only require 2.5.  I'll commit a fix to use the old
style formatting that is equivalent shortly.