From f9a3315367c4123126384033527cd273dc99dc31 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 7 Apr 2015 17:52:32 -0700 Subject: [PATCH] Remove useless e2e noise --- hack/e2e-internal/e2e-watch-events.sh | 36 --------------------------- hack/e2e.go | 2 -- 2 files changed, 38 deletions(-) delete mode 100755 hack/e2e-internal/e2e-watch-events.sh diff --git a/hack/e2e-internal/e2e-watch-events.sh b/hack/e2e-internal/e2e-watch-events.sh deleted file mode 100755 index 19aca120ee4..00000000000 --- a/hack/e2e-internal/e2e-watch-events.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail - -KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. - -: ${KUBE_VERSION_ROOT:=${KUBE_ROOT}} -: ${KUBECTL:="${KUBE_VERSION_ROOT}/cluster/kubectl.sh"} -: ${KUBE_CONFIG_FILE:="config-test.sh"} - -export KUBECTL KUBE_CONFIG_FILE - -source "${KUBE_ROOT}/cluster/kube-env.sh" -source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh" - -prepare-e2e - -while true; do - ${KUBECTL} get events --watch-only -done diff --git a/hack/e2e.go b/hack/e2e.go index 290c4ec1977..9bc47f8786b 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -263,8 +263,6 @@ func shuffleStrings(strings []string, r *rand.Rand) { } func Test() bool { - defer runBashUntil("watchEvents", exec.Command(filepath.Join(*root, "hack/e2e-internal/e2e-watch-events.sh")))() - if !IsUp() { log.Fatal("Testing requested, but e2e cluster not up!") }