Author: danielsh
Date: Thu Jul 28 18:33:31 2011
New Revision: 1151957
URL: http://svn.apache.org/viewvc?rev=1151957&view=rev
Log:
Factor out a magic number.
* build/run_tests.py
(SVN_VER_MINOR): New.
(TestHarness.__init__): Use it.
* subversion/tests/cmdline/svntest/main.py
(SVN_VER_MINOR): New.
(_create_parser, _parse_options): Use it.
Modified:
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
Modified: subversion/trunk/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1151957&r1=1151956&r2=1151957&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Thu Jul 28 18:33:31 2011
@@ -44,6 +44,7 @@ separated list of test numbers; the defa
# A few useful constants
LINE_LENGTH = 45
+SVN_VER_MINOR = 8
import os, re, subprocess, sys, imp
from datetime import datetime
@@ -111,8 +112,9 @@ class TestHarness:
# If you change the below condition then change in
# ../subversion/tests/cmdline/svntest/main.py too.
if server_minor_version is not None:
- if int(server_minor_version) < 3 or int(server_minor_version) > 8:
- sys.stderr.write("Test harness only supports server minor versions
3-8\n")
+ if int(server_minor_version) not in range(3, 1+SVN_VER_MINOR):
+ sys.stderr.write("Test harness only supports server minor versions
3-%d\n"
+ % SVN_VER_MINOR)
sys.exit(1)
self.verbose = verbose
self.cleanup = cleanup
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1151957&r1=1151956&r2=1151957&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Thu Jul 28
18:33:31 2011
@@ -51,6 +51,7 @@ import svntest
from svntest import Failure
from svntest import Skip
+SVN_VER_MINOR = 8
######################################################################
#
@@ -1495,7 +1496,8 @@ def _create_parser():
"it supports both, else assume it's using this " +
"one; the default is " + _default_http_library)
parser.add_option('--server-minor-version', type='int', action='store',
- help="Set the minor version for the server ('3'..'8').")
+ help="Set the minor version for the server ('3'..'%d')."
+ % SVN_VER_MINOR)
parser.add_option('--fsfs-packing', action='store_true',
help="Run 'svnadmin pack' automatically")
parser.add_option('--fsfs-sharding', action='store', type='int',
@@ -1515,7 +1517,7 @@ def _create_parser():
# most of the defaults are None, but some are other values, set them here
parser.set_defaults(
- server_minor_version=8,
+ server_minor_version=SVN_VER_MINOR,
url=file_scheme_prefix + pathname2url(os.path.abspath(os.getcwd())),
http_library=_default_http_library)
@@ -1539,8 +1541,9 @@ def _parse_options(arglist=sys.argv[1:])
# If you change the below condition then change
# ../../../../build/run_tests.py too.
- if options.server_minor_version < 3 or options.server_minor_version > 8:
- parser.error("test harness only supports server minor versions 3-8")
+ if options.server_minor_version not in range(3, SVN_VER_MINOR+1):
+ parser.error("test harness only supports server minor versions 3-%d"
+ % SVN_VER_MINOR)
if options.url:
if options.url[-1:] == '/': # Normalize url to have no trailing slash
