diff options
| author | melanie witt <melwittt@gmail.com> | 2017-09-27 20:02:36 +0000 |
|---|---|---|
| committer | melanie witt <melwittt@gmail.com> | 2017-10-05 21:45:46 +0000 |
| commit | 53f244da1279dd9ffe6632193b580fc3cead9f37 (patch) | |
| tree | a01a789f8b8c51dd5f15fe6e1ab5661298524f2d /tools | |
| parent | 3174ee13a1541230a4b7b2a4737d679691fb14b3 (diff) | |
| download | nova-53f244da1279dd9ffe6632193b580fc3cead9f37.tar.gz | |
Make setenv consistent for unit, func, and api-samples
Since ostestr switched to running stestr under the covers, we lost the
old magic setting of the environment variables via .testr.conf for
capturing stderr/stdout and the test timeout. This makes the unit,
functional, and api-samples envs consistent with the py27 env that was
already updated to set those variables.
This also updates the pretty_tox3.sh script to run stestr directly.
Change-Id: I27fa9b7e25c1a1dc921653eec84864423f898a85
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/pretty_tox3.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/pretty_tox3.sh b/tools/pretty_tox3.sh index f73939531a..ffc0e58f36 100755 --- a/tools/pretty_tox3.sh +++ b/tools/pretty_tox3.sh @@ -9,7 +9,7 @@ else fi if [ -z "$TESTRARGS" ]; then - ostestr --blacklist_file $blacklist_file + stestr run --blacklist-file $blacklist_file else - ostestr -r "$TESTRARGS" + stestr run "$TESTRARGS" fi |