diff options
| author | Monty Taylor <mordred@inaugust.com> | 2012-09-27 10:50:19 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2012-09-27 22:34:51 -0700 |
| commit | 49487a6ac63ae32b61687d9e8aeb0956590445d7 (patch) | |
| tree | f4e0e154eb6d444536c2895257f2f1606ff02551 /run_tests.sh | |
| parent | 431e50a7851d2e7dbb212d02647faeb958ed21e8 (diff) | |
| download | keystone-49487a6ac63ae32b61687d9e8aeb0956590445d7.tar.gz keystone-49487a6ac63ae32b61687d9e8aeb0956590445d7.tar.xz keystone-49487a6ac63ae32b61687d9e8aeb0956590445d7.zip | |
Remove run_test.py in favor of stock nose.
Move specific functionality into test fixtures, so that normal test runners
can work. For now, this means we can use unaltered nose. For the future, it
gets us closer to being able to use other test runners such as testrepository
which allow for things like parallel test runs and re-running failed tests
in a dev/test cycle.
Also, aligns keystone with nova and glance.
Change-Id: Ic1966281c0bdfbc09792360209692e9d4a0a51a7
Diffstat (limited to 'run_tests.sh')
| -rwxr-xr-x | run_tests.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/run_tests.sh b/run_tests.sh index a225d78d..2e21e24f 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -32,6 +32,7 @@ function usage { echo " -h, --help Print this usage message" echo " -xintegration Ignore all keystoneclient test cases (integration tests)" echo " --hide-elapsed Don't print the elapsed time for each test along with slow test list" + echo " --standard-threads Don't do the eventlet threading monkeypatch." 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 " @@ -51,6 +52,9 @@ function process_option { -P|--no-pep8) no_pep8=1;; -c|--coverage) coverage=1;; -xintegration) nokeystoneclient=1;; + --standard-threads) + export STANDARD_THREADS=1 + ;; -*) noseopts="$noseopts $1";; *) noseargs="$noseargs $1" esac @@ -114,7 +118,7 @@ function run_pep8 { --exclude=vcsversion.py ${srcfiles} | tee pep8.txt } -NOSETESTS="python run_tests.py $noseopts $noseargs" +NOSETESTS="nosetests $noseopts $noseargs" if [ $never_venv -eq 0 ] then |