summaryrefslogtreecommitdiff
path: root/.functests
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2019-04-09 08:34:18 -0700
committerTim Burke <tim.burke@gmail.com>2019-05-03 22:48:22 -0700
commit1e4cdca3390906a7bc4b27af9afa62002d20880c (patch)
treefebbad35c9f86b63e6ab4b2b01630b28a7dbf802 /.functests
parent0df50b51246314fa38a08ddf79937ab594f74bf2 (diff)
downloadswift-1e4cdca3390906a7bc4b27af9afa62002d20880c.tar.gz
Fix ostestr invocation
More-recent versions of stestr are rather picky about wanting an integer for concurrency [1], but ostestr prior to [2] defaults it to None. As a result, all our func tests would fail with: TypeError: int() argument must be a string or a number, not 'NoneType' Also, move the rolling upgrade job to non-voting since it's going to pull in the old version but try to run with new deps. [1] https://github.com/mtreinish/stestr/commit/c93bc81 [2] https://review.openstack.org/#/c/651275/ Change-Id: Icba6c46bcff0e0516107e0f6742d32c92488ae20
Diffstat (limited to '.functests')
-rwxr-xr-x.functests2
1 files changed, 1 insertions, 1 deletions
diff --git a/.functests b/.functests
index bf920798c..ad58ec713 100755
--- a/.functests
+++ b/.functests
@@ -7,7 +7,7 @@ SRC_DIR=$(python -c "import os; print os.path.dirname(os.path.realpath('$0'))")
cd ${SRC_DIR} > /dev/null
export TESTS_DIR=${SRC_DIR}/test/functional
-ARGS="--serial ${@:-"--pretty"}"
+ARGS="--concurrency 1 ${@:-"--pretty"}"
ostestr $ARGS
rvalue=$?
cd - > /dev/null