You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/21 15:02:07 UTC
[1/3] allura git commit: Remove min 2 concurrent tests,
since issues was fixed a while ago
Repository: allura
Updated Branches:
refs/heads/master 90de4c9a2 -> c18594b49
Remove min 2 concurrent tests, since issues was fixed a while ago
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c18594b4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c18594b4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c18594b4
Branch: refs/heads/master
Commit: c18594b49334f20eb3e81459a7b476ffe1ab7133
Parents: 5ff0b82
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Dec 16 15:15:45 2015 -0500
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Dec 21 15:19:21 2015 +0200
----------------------------------------------------------------------
run_tests | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c18594b4/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index 1e3e7e7..95729de 100755
--- a/run_tests
+++ b/run_tests
@@ -30,7 +30,7 @@ import os
CPUS = multiprocessing.cpu_count()
CONCURRENT_SUITES = (CPUS // 4) or CPUS
-CONCURRENT_TESTS = max(CPUS // CONCURRENT_SUITES, 2) # need at least two, see thread http://mail-archives.apache.org/mod_mbox/allura-dev/201409.mbox/%3C541C5756.1020604%40brondsema.net%3E
+CONCURRENT_TESTS = CPUS // CONCURRENT_SUITES
PROC_TIMEOUT = 360
ALT_PKG_PATHS = {
[3/3] allura git commit: Set NOSE_IGNORE_CONFIG_FILES so that local
settings aren't used. E.g. nose-progressive plugin is very nice output but it
disables multiprocess testing
Posted by je...@apache.org.
Set NOSE_IGNORE_CONFIG_FILES so that local settings aren't used. E.g. nose-progressive plugin is very nice output but it disables multiprocess testing
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/f82e40c3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/f82e40c3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/f82e40c3
Branch: refs/heads/master
Commit: f82e40c3ffa20b56240605974d20f52dd26c9db1
Parents: 90de4c9
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Dec 16 13:32:58 2015 -0500
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Dec 21 15:19:21 2015 +0200
----------------------------------------------------------------------
run_tests | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/f82e40c3/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index 4640244..b854da5 100755
--- a/run_tests
+++ b/run_tests
@@ -130,6 +130,8 @@ def run_tests_in_parallel(options, nosetests_args):
return CPUS
cmds = []
+ env = dict(os.environ,
+ NOSE_IGNORE_CONFIG_FILES='1')
for package in check_packages(options.packages):
cover_package = package.lower()
our_nosetests_args = copy(nosetests_args)
@@ -139,7 +141,7 @@ def run_tests_in_parallel(options, nosetests_args):
nosetests_args=' '.join(our_nosetests_args),
multiproc_args=get_multiproc_args(package),
)
- cmds.append((cmd, dict(cwd=package)))
+ cmds.append((cmd, dict(cwd=package, env=env)))
return run_many(cmds, processes=get_concurrent_suites())
[2/3] allura git commit: Only show cwd,
out of the kwargs. (env is very large)
Posted by je...@apache.org.
Only show cwd, out of the kwargs. (env is very large)
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5ff0b82d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5ff0b82d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5ff0b82d
Branch: refs/heads/master
Commit: 5ff0b82d296da93f66bd517fba1dcd6b9d9129ec
Parents: f82e40c
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Dec 16 13:33:26 2015 -0500
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Dec 21 15:19:21 2015 +0200
----------------------------------------------------------------------
run_tests | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/5ff0b82d/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index b854da5..1e3e7e7 100755
--- a/run_tests
+++ b/run_tests
@@ -26,6 +26,7 @@ import subprocess
import sys
import threading
import textwrap
+import os
CPUS = multiprocessing.cpu_count()
CONCURRENT_SUITES = (CPUS // 4) or CPUS
@@ -43,7 +44,8 @@ NOT_MULTIPROC_SAFE = [
def run_one(cmd, **popen_kwargs):
- print '{} running {} {}'.format(threading.current_thread(), cmd, popen_kwargs)
+ cmd_to_show = u'{} in {}'.format(cmd, popen_kwargs.get('cwd', '.'))
+ print u'{} running {}'.format(threading.current_thread(), cmd_to_show)
sys.stdout.flush()
all_popen_kwargs = dict(shell=True, stderr=subprocess.STDOUT,
@@ -60,7 +62,7 @@ def run_one(cmd, **popen_kwargs):
out_remainder, _ = proc.communicate()
sys.stdout.write(out_remainder)
sys.stdout.flush()
- print 'finished {} {}'.format(cmd, popen_kwargs)
+ print u'finished {}'.format(cmd_to_show)
sys.stdout.flush()
return proc