github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105206 from pohly/test-integration-help

Browse Source 
test/integration: skip etcd startup for -help flag
This commit is contained in:
Kubernetes Prow Robot 2021-09-24 10:29:23 -07:00 committed by GitHub
commit 86d23cf441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/framework/etcd.go
View File

@ -18,6 +18,7 @@ package framework
import ( import (
"context" "context"
"flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -168,6 +169,9 @@ func RunCustomEtcd(dataDir string, customFlags []string) (url string, stopFn fun
// EtcdMain starts an etcd instance before running tests. // EtcdMain starts an etcd instance before running tests.
func EtcdMain(tests func() int) { func EtcdMain(tests func() int) {
// Bail out early when -help was given as parameter.
flag.Parse()
stop, err := startEtcd() stop, err := startEtcd()
if err != nil { if err != nil {
klog.Fatalf("cannot run integration tests: unable to start etcd: %v", err) klog.Fatalf("cannot run integration tests: unable to start etcd: %v", err)

2
test/integration/scheduler_perf/main_test.go
View File

@ -17,13 +17,11 @@ limitations under the License.
package benchmark package benchmark
import ( import (
"flag"
"testing" "testing"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
flag.Parse()
framework.EtcdMain(m.Run) framework.EtcdMain(m.Run)
} }