From 3fc181fb1b8a6cb1e01e50e561fdbeb62dd95111 Mon Sep 17 00:00:00 2001
From: Derek McQuay <dmcquay@apprenda.com>
Date: Wed, 8 Feb 2017 10:10:08 -0800
Subject: [PATCH] kubeadm: moved to location after SIG discussion

---
 cmd/kubeadm/test/cmd/BUILD        | 5 ++++-
 cmd/kubeadm/test/cmd/init_test.go | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cmd/kubeadm/test/cmd/BUILD b/cmd/kubeadm/test/cmd/BUILD
index 48e86ffd2f6..5b385a59d86 100644
--- a/cmd/kubeadm/test/cmd/BUILD
+++ b/cmd/kubeadm/test/cmd/BUILD
@@ -16,7 +16,10 @@ go_library(
 
 go_test(
     name = "go_default_test",
-    srcs = ["token_test.go"],
+    srcs = [
+        "init_test.go",
+        "token_test.go",
+    ],
     args = ["--kubeadm-path=../../kubeadm"],
     data = ["//cmd/kubeadm"],
     library = ":go_default_library",
diff --git a/cmd/kubeadm/test/cmd/init_test.go b/cmd/kubeadm/test/cmd/init_test.go
index 2c43483e489..fbc524237fa 100644
--- a/cmd/kubeadm/test/cmd/init_test.go
+++ b/cmd/kubeadm/test/cmd/init_test.go
@@ -20,11 +20,16 @@ import "testing"
 
 // kubeadmReset executes "kubeadm reset" and restarts kubelet.
 func kubeadmReset() error {
-	_, _, err := RunCmd(kubeadmPath, "reset")
+	_, _, err := RunCmd(*kubeadmPath, "reset")
 	return err
 }
 
 func TestCmdInitToken(t *testing.T) {
+	if *kubeadmCmdSkip {
+		t.Log("kubeadm cmd tests being skipped")
+		t.Skip()
+	}
+
 	var initTest = []struct {
 		args     string
 		expected bool
@@ -34,7 +39,7 @@ func TestCmdInitToken(t *testing.T) {
 	}
 
 	for _, rt := range initTest {
-		_, _, actual := RunCmd(kubeadmPath, "init", rt.args, "--skip-preflight-checks")
+		_, _, actual := RunCmd(*kubeadmPath, "init", rt.args, "--skip-preflight-checks")
 		if (actual == nil) != rt.expected {
 			t.Errorf(
 				"failed CmdInitToken running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t  actual: %t",