svn commit: r1708901 - in /subversion/trunk/subversion: libsvn_fs_x/revprops.c tests/cmdline/svnadmin_tests.py

[st...@apache.org]

Author: stefan2
Date: Thu Oct 15 22:41:34 2015
New Revision: 1708901

URL: http://svn.apache.org/viewvc?rev=1708901&view=rev
Log:
Make our test suite pass again for FSX.

* subversion/libsvn_fs_x/revprops.c
  (read_revprop_generation_file): Our atoi wrapper is picky about trailing
                                  whitespace.

* subversion/tests/cmdline/svnadmin_tests.py
  (check_hotcopy_fsfs_fsx): The revprop generation file contains one number.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/revprops.c
    subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py

Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1708901&r1=1708900&r2=1708901&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Thu Oct 15 22:41:34 2015
@@ -110,6 +110,7 @@ read_revprop_generation_file(apr_int64_t
        * file replacement scheme. */
       if (!err)
         {
+          svn_stringbuf_strip_whitespace(buf);
           SVN_ERR(svn_cstring_atoi64(current, buf->data));
           break;
         }

Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1708901&r1=1708900&r2=1708901&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Thu Oct 15 22:41:34 2015
@@ -147,7 +147,7 @@ def check_hotcopy_fsfs_fsx(src, dst):
         # the hotcopy destination (i.e. a fresh cache generation)
         if src_file == 'revprop-generation':
           f2 = open(dst_path, 'r')
-          revprop_gen = int(f2.read().strip().split()[1])
+          revprop_gen = int(f2.read().strip())
           if revprop_gen != 0:
               raise svntest.Failure("Hotcopy destination has non-zero " +
                                     "revprop generation")