From cab9c845ac6a3771cdc3a555ef511f895e2603e2 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Fri, 18 Mar 2016 12:42:23 -0700
Subject: [PATCH] Make Swift/Keystone logs available in gate results

While we're at it, abort on *any* failure in setup_keystone.

Change-Id: I08510a4825366a3ba1a8d667905cd9141fd5426e
---
 swift3/test/functional/run_test.sh    | 9 +++++----
 swift3/test/functional/setup_keystone | 9 ++++++++-
 tox.ini                               | 3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/swift3/test/functional/run_test.sh b/swift3/test/functional/run_test.sh
index f87cdc8d..143443ed 100755
--- a/swift3/test/functional/run_test.sh
+++ b/swift3/test/functional/run_test.sh
@@ -79,21 +79,22 @@ cd -
 _start()
 {
     local name=$1; shift
+    local log_file="${LOG_DEST:-${TEST_DIR}/log}/${name}.log"
+    mkdir -p "$(dirname "${log_file}")"
 
     echo Start ${name}-server.
-    "$@" > ${TEST_DIR}/log/${name}.log 2>&1 &
+    "$@" > "${log_file}" 2>&1 &
     export ${name}_pid=$!
 
     local cnt
     for cnt in `seq 60`; do # wait at most 60 seconds
-	grep 'Started child' ${TEST_DIR}/log/${name}.log > /dev/null
-	if [ $? == 0 ]; then
+	if ! grep 'Started child' "${log_file}" > /dev/null ; then
 	    return
 	fi
 	sleep 1
     done
 
-    cat ${TEST_DIR}/log/${name}.log
+    cat "${log_file}"
     echo "Cannot start ${name}-server."
     exit 1
 }
diff --git a/swift3/test/functional/setup_keystone b/swift3/test/functional/setup_keystone
index 2b6ba3cd..cdfb4674 100644
--- a/swift3/test/functional/setup_keystone
+++ b/swift3/test/functional/setup_keystone
@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -e
+
 export OS_AUTH_URL=http://localhost:35357/v2.0
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
@@ -75,7 +77,10 @@ _setup_keystone()
 {
     rm -f ${TEST_DIR}/keystone.db 2>&1
 
-    keystone-all --config-file conf/keystone.conf --debug > ${TEST_DIR}/log/keystone.log 2>&1 &
+    local log_file="${LOG_DEST:-${TEST_DIR}/log}/keystone.log"
+    mkdir -p "$(dirname "${log_file}")"
+
+    keystone-all --config-file conf/keystone.conf --debug > "${log_file}" 2>&1 &
     export keystone_pid=$!
 
     keystone-manage --config-file conf/keystone.conf --debug db_sync
@@ -85,3 +90,5 @@ _setup_keystone()
 }
 
 _setup_keystone
+
+set +e
diff --git a/tox.ini b/tox.ini
index 1c1801a4..6ba1526c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,10 +25,12 @@ setenv = VIRTUAL_ENV={envdir}
 [testenv:tempauth]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=tempauth
+         LOG_DEST={envdir}/log
 
 [testenv:keystone]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=keystone
+         LOG_DEST={envdir}/log
 # keystone 9.0.0 from github
 deps =
   {[testenv]deps}
@@ -37,6 +39,7 @@ deps =
 [testenv:s3acl]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=tempauth
+         LOG_DEST={envdir}/log
          S3ACL=true
 
 [testenv:pylint]