svn commit: r1706375 - in /subversion/trunk: build/run_tests.py win-tests.py

[ko...@apache.org]

Author: kotkov
Date: Fri Oct  2 11:48:31 2015
New Revision: 1706375

URL: http://svn.apache.org/viewvc?rev=1706375&view=rev
Log:
Following up on r1700215, unbreak the test runner's compabitility mode.

For instance, make check SERVER_MINOR_VERSION=8 used to error out
like this:

  Traceback (most recent call last):
    File "./build/run_tests.py", line 789, in <module>
      main()
    File "./build/run_tests.py", line 782, in main
      failed = th.run(args[2:])
    File "./build/run_tests.py", line 322, in run
      self._init_c_tests()
    File "./build/run_tests.py", line 196, in _init_c_tests
      self.opts.server_minor_version)
  TypeError: cannot concatenate 'str' and 'int' objects

* build/run_tests.py
  (TestHarness._init_c_tests): Use %d format for the minor version value,
   as we already do in _init_py_tests().

* win-tests.py:
  (): Convert the minor version value to integer, as we'll then be passing
   it to TestHarness.__init__() that expects an int.

Modified:
    subversion/trunk/build/run_tests.py
    subversion/trunk/win-tests.py

Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1706375&r1=1706374&r2=1706375&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Fri Oct  2 11:48:31 2015
@@ -192,7 +192,7 @@ class TestHarness:
     if self.opts.fsfs_version is not None:
       cmdline.append('--fsfs-version=%d' % self.opts.fsfs_version)
     if self.opts.server_minor_version is not None:
-      cmdline.append('--server-minor-version=' +
+      cmdline.append('--server-minor-version=%d' %
                      self.opts.server_minor_version)
     if self.opts.mode_filter is not None:
       cmdline.append('--mode-filter=' + self.opts.mode_filter)

Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1706375&r1=1706374&r2=1706375&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Fri Oct  2 11:48:31 2015
@@ -241,7 +241,7 @@ for opt, val in opts:
     enable_sasl = 1
     base_url = "svn://localhost/"
   elif opt == '--server-minor-version':
-    server_minor_version = val
+    server_minor_version = int(val)
   elif opt == '--bin':
     svn_bin = val
   elif opt in ('-p', '--parallel'):