Give functional tests another chance to pass

In the process, move from using os-testr to stestr.

Change-Id: Ib6651aab8b009605bf0855ec217003936c0fae6e

.functests

@@ -7,8 +7,8 @@ SRC_DIR=$(dirname $(realpath "$0"))
 
 cd ${SRC_DIR} > /dev/null
 export TESTS_DIR=${SRC_DIR}/test/functional
-ARGS="--concurrency 1 ${@:-"--pretty"}"
-ostestr $ARGS
+ARGS="run --concurrency 1 $@"
+stestr $ARGS || stestr run --concurrency 1 --failing
 rvalue=$?
 cd -  > /dev/null
 

.stestr.conf

@@ -0,0 +1,2 @@
+[DEFAULT]
+test_path=./test/functional

.testr.conf

@@ -1,4 +0,0 @@
-[DEFAULT]
-test_command=SWIFT_TEST_DEBUG_LOGS=${SWIFT_TEST_DEBUG_LOGS} ${PYTHON:-python} -m subunit.run discover -t ./ ${TESTS_DIR:-./test/functional/} $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list

lower-constraints.txt

@@ -43,7 +43,6 @@ netifaces==0.8
 nose==1.3.7
 nosehtmloutput==0.0.3
 nosexcover==1.0.10
-os-testr==0.8.0
 oslo.config==4.0.0
 oslo.i18n==3.20.0
 oslo.log==3.22.0

py2-constraints.txt

@@ -52,7 +52,6 @@ openstackdocstheme===1.31.2
 stevedore===1.32.0
 botocore===1.15.39
 cmd2===0.8.9
-os-testr===1.1.0
 xattr===0.9.7
 six===1.14.0
 dulwich===0.19.15

test-requirements.txt

@@ -8,7 +8,7 @@ coverage>=3.6 # Apache-2.0
 nose>=1.3.7 # LGPL
 nosexcover>=1.0.10 # BSD
 nosehtmloutput>=0.0.3 # Apache-2.0
-os-testr>=0.8.0 # Apache-2.0
+stestr>=2.0.0 # Apache-2.0
 mock>=2.0 # BSD
 python-swiftclient>=3.2.0
 python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0