You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/11/10 15:48:15 UTC
svn commit: r1033500 - in /subversion/trunk: build/run_tests.py
subversion/tests/cmdline/authz_tests.py
subversion/tests/cmdline/merge_authz_tests.py
subversion/tests/cmdline/svnsync_tests.py
Author: hwright
Date: Wed Nov 10 14:48:14 2010
New Revision: 1033500
URL: http://svn.apache.org/viewvc?rev=1033500&view=rev
Log:
Expose the serial_only flag in each test suite which needs it, so that
run_tests.py knows how to properly execute these tests.
(Note: this doesn't have any tangible effect now, since run_tests.py isn't
currently passing the correct value for 'parallel' down to the test modules.)
* build/run_tests.py
(_run_py_test): Divine the serial_only flag from the test module, and
pass that to the test executor.
* subversion/tests/cmdline/svnsync_tests.py,
subversion/tests/cmdline/merge_authz_tests.py,
subversion/tests/cmdline/authz_tests.py:
Set a module-wide serial_only flag.
Modified:
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1033500&r1=1033499&r2=1033500&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Wed Nov 10 14:48:14 2010
@@ -351,9 +351,12 @@ class TestHarness:
self.dots_written = dots
+ serial_only = hasattr(prog_mod, 'serial_only') and prog_mod.serial_only
+
# run the tests
svntest.testcase.TextColors.disable()
failed = svntest.main.execute_tests(prog_mod.test_list,
+ serial_only=serial_only,
test_name=progbase,
progress_func=progress_func)
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1033500&r1=1033499&r2=1033500&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Wed Nov 10 14:48:14 2010
@@ -1090,9 +1090,10 @@ test_list = [ None,
Skip(authz_recursive_ls,
svntest.main.is_ra_type_file),
]
+serial_only = True
if __name__ == '__main__':
- svntest.main.run_tests(test_list, serial_only = True)
+ svntest.main.run_tests(test_list, serial_only = serial_only)
# NOTREACHED
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=1033500&r1=1033499&r2=1033500&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Wed Nov 10 14:48:14 2010
@@ -689,9 +689,10 @@ test_list = [ None,
svntest.main.is_ra_type_file),
svntest.main.server_has_mergeinfo),
]
+serial_only = True
if __name__ == '__main__':
- svntest.main.run_tests(test_list, serial_only = True)
+ svntest.main.run_tests(test_list, serial_only = serial_only)
# NOTREACHED
Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests.py?rev=1033500&r1=1033499&r2=1033500&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests.py Wed Nov 10 14:48:14 2010
@@ -870,9 +870,10 @@ test_list = [ None,
descend_into_replace,
XFail(delete_revprops),
]
+serial_only = True
if __name__ == '__main__':
- svntest.main.run_tests(test_list, serial_only = True)
+ svntest.main.run_tests(test_list, serial_only = serial_only)
# NOTREACHED