commit 1f844bc5185b9328b292a8315c0bbf69d7604ff1
author Filip Pytloun <filip@pytloun.cz> Tue Aug 09 16:29:52 2016 +0200
committer Filip Pytloun <filip@pytloun.cz> Tue Aug 09 16:29:52 2016 +0200
tree e85fb62a3fface28384e5401dee9604df4861e3e
parent ca224cb19b7ba520fb1f55ee0a99e6c6d9ad00d4

Imported Upstream version 2016.8.2

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 3f42101..8c07e58 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -18,7 +18,7 @@
 SALT_CONFIG_DIR=${SALT_CONFIG_DIR:-${BUILDDIR}/salt}
 SALT_CACHE_DIR=${SALT_CACHE_DIR:-${SALT_CONFIG_DIR}/cache}
 
-SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR}"
+SALT_OPTS="${SALT_OPTS} --retcode-passthrough --local -c ${SALT_CONFIG_DIR} --log-file=/dev/null"
 
 if [ "x${SALT_VERSION}" != "x" ]; then
     PIP_SALT_VERSION="==${SALT_VERSION}"
@@ -64,6 +64,7 @@
 file_client: local
 cachedir: ${SALT_CACHE_DIR}
 verify_env: False
+minion_id_caching: False
 
 file_roots:
   base: