From 868fd6e383c0a8dc7324cd7f631afb7bd8d36ea4 Mon Sep 17 00:00:00 2001
From: Oleksii Chuprykov <ochuprykov@mirantis.com>
Date: Thu, 11 Sep 2014 19:02:38 +0300
Subject: [PATCH] Run tests with default concurrency 0
Setting concurrency to 0 would enable Glance tests to be run using the
the total number of cores on the system rather than by a single one.
This would, by default, speed up the run time of tests for developers
who are not aware about it. Also, any jobs which run these tests for
Continuous Integration would be benefitted without having to deal with
the machine level logic.
Closes-Bug: #1368274
Change-Id: I0842b0c0be1272d479fad9ef7609cd8a29231cb5
---
run_tests.sh | 4 ++--
tox.ini | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/run_tests.sh b/run_tests.sh
index bfa16c628b..b764f18fe9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -23,7 +23,7 @@ function usage {
echo " --tools-path <dir> Location of the tools directory"
echo " Default: \$(pwd)"
echo " --concurrency <concurrency> How many processes to use when running the tests. A value of 0 autodetects concurrency from your CPU count"
- echo " Default: 1"
+ echo " Default: 0"
echo ""
echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
echo " If no virtualenv is found, the script will ask if you would like to create one. If you "
@@ -85,7 +85,7 @@ no_pep8=0
coverage=0
debug=0
update=0
-concurrency=1
+concurrency=0
LANG=en_US.UTF-8
LANGUAGE=en_US:en
diff --git a/tox.ini b/tox.ini
index 3e4311f43a..c4eb23296d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ install_command = pip install --allow-all-external --allow-insecure netaddr -U {
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python -m glance.openstack.common.lockutils python setup.py test --slowest \
- --testr-args='--concurrency 1 {posargs}'
+ --testr-args='--concurrency 0 {posargs}'
whitelist_externals = bash
[tox:jenkins]