svn commit: r1145455 - in /subversion/trunk: build/run_tests.py subversion/tests/cmdline/svntest/main.py

[da...@apache.org]

Author: danielsh
Date: Tue Jul 12 04:58:00 2011
New Revision: 1145455

URL: http://svn.apache.org/viewvc?rev=1145455&view=rev
Log:
Allow the test suite to pass --pre-1.4-compatible.

Patch by: Noorul Islam K M
(log message by me)

* build/run_tests.py
  (TestHarness.__init__): Allow server_minor_version=3.

* subversion/tests/cmdline/svntest/main.py
  (create_repos, _parse_options): Accept and parse server_minor_version=3.

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=1145455&r1=1145454&r2=1145455&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Tue Jul 12 04:58:00 2011
@@ -111,8 +111,8 @@ 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) < 4 or int(server_minor_version) > 7:
-        sys.stderr.write("Test harness only supports server minor versions 4-7\n")
+      if int(server_minor_version) < 3 or int(server_minor_version) > 7:
+        sys.stderr.write("Test harness only supports server minor versions 3-7\n")
         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=1145455&r1=1145454&r2=1145455&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Jul 12 04:58:00 2011
@@ -755,7 +755,9 @@ def create_repos(path):
     os.makedirs(path) # this creates all the intermediate dirs, if neccessary
 
   opts = ("--bdb-txn-nosync",)
-  if options.server_minor_version < 5:
+  if options.server_minor_version < 4:
+    opts += ("--pre-1.4-compatible",)
+  elif options.server_minor_version < 5:
     opts += ("--pre-1.5-compatible",)
   elif options.server_minor_version < 6:
     opts += ("--pre-1.6-compatible",)
@@ -1540,8 +1542,8 @@ 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 < 4 or options.server_minor_version > 7:
-    parser.error("test harness only supports server minor versions 4-7")
+  if options.server_minor_version < 3 or options.server_minor_version > 7:
+    parser.error("test harness only supports server minor versions 3-7")
 
   if options.url:
     if options.url[-1:] == '/': # Normalize url to have no trailing slash