From b56226342759dc3f06e3788dcc480c65b79243db Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Fri, 30 Mar 2018 17:19:40 -0400
Subject: [PATCH] Avoid data races in unit tests

---
 pkg/kubelet/cm/cpumanager/state/state_file_test.go | 7 -------
 pkg/kubelet/cm/devicemanager/manager_test.go       | 2 --
 2 files changed, 9 deletions(-)

diff --git a/pkg/kubelet/cm/cpumanager/state/state_file_test.go b/pkg/kubelet/cm/cpumanager/state/state_file_test.go
index b507884c426..edccf87998c 100644
--- a/pkg/kubelet/cm/cpumanager/state/state_file_test.go
+++ b/pkg/kubelet/cm/cpumanager/state/state_file_test.go
@@ -18,7 +18,6 @@ package state
 
 import (
 	"bytes"
-	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -69,9 +68,6 @@ func stderrCapture(t *testing.T, f func() State) (bytes.Buffer, State) {
 }
 
 func TestFileStateTryRestore(t *testing.T) {
-	flag.Set("alsologtostderr", "true")
-	flag.Parse()
-
 	testCases := []struct {
 		description      string
 		stateFileContent string
@@ -292,9 +288,6 @@ func TestFileStateTryRestorePanic(t *testing.T) {
 }
 
 func TestUpdateStateFile(t *testing.T) {
-	flag.Set("alsologtostderr", "true")
-	flag.Parse()
-
 	testCases := []struct {
 		description   string
 		expErr        string
diff --git a/pkg/kubelet/cm/devicemanager/manager_test.go b/pkg/kubelet/cm/devicemanager/manager_test.go
index b0ef2857fd1..c1b5a15a232 100644
--- a/pkg/kubelet/cm/devicemanager/manager_test.go
+++ b/pkg/kubelet/cm/devicemanager/manager_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package devicemanager
 
 import (
-	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -546,7 +545,6 @@ type TestResource struct {
 }
 
 func TestPodContainerDeviceAllocation(t *testing.T) {
-	flag.Set("alsologtostderr", fmt.Sprintf("%t", true))
 	res1 := TestResource{
 		resourceName:     "domain1.com/resource1",
 		resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI),