Merge pull request #14456 from brendandburns/flakes3

Turn off race detection in the etcd tools test as etcd client isn't thread safe.

Merge pull request #14456 from brendandburns/flakes3
0c10d112 · Jerzy Szczepkowski · fabff597 · d3379e72 · 0c10d112 · 0c10d112
Commit 0c10d112 authored Sep 24, 2015 by Jerzy Szczepkowski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

etcd_tools_test.go test/integration/etcd_tools_test.go +1 -1

service_account_test.go test/integration/service_account_test.go +1 -1

No files found.
--- a/test/integration/etcd_tools_test.go
+++ b/test/integration/etcd_tools_test.go
-// +build integration,!no-etcd
+// +build integration,!no-etcd,!race
 /*
 Copyright 2014 The Kubernetes Authors All rights reserved.

--- a/test/integration/service_account_test.go
+++ b/test/integration/service_account_test.go
-// +build integration,!no-etcd
+// +build integration,!no-etcd,!race
 /*
 Copyright 2014 The Kubernetes Authors All rights reserved.