mktemp on OSX behaves differently than Linux

hack/test-integration and hack/test-cmd are currently broken
This commit is contained in:
Clayton Coleman 2015-07-30 00:41:20 -04:00
parent 769230e735
commit 1a64830ef1
2 changed files with 2 additions and 2 deletions

View File

@ -39,7 +39,7 @@ kube::etcd::start() {
fi
# Start etcd
ETCD_DIR=$(mktemp -d -t test-etcd.XXXXXX)
ETCD_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t test-etcd.XXXXXX)
kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null"
etcd -data-dir ${ETCD_DIR} --bind-addr ${host}:${port} >/dev/null 2>/dev/null &
ETCD_PID=$!

View File

@ -54,7 +54,7 @@ kube::util::wait_for_url() {
# KUBE_TEMP
kube::util::ensure-temp-dir() {
if [[ -z ${KUBE_TEMP-} ]]; then
KUBE_TEMP=$(mktemp -d -t kubernetes.XXXXXX)
KUBE_TEMP=$(mktemp -d 2>/dev/null || mktemp -d -t kubernetes.XXXXXX)
fi
}