kubeadm: moved to location after SIG discussion

This commit is contained in:
Derek McQuay 2017-02-08 10:10:08 -08:00
parent 8e9f6ece8d
commit 3fc181fb1b
No known key found for this signature in database
GPG Key ID: 92A7BC0C86B0B91A
2 changed files with 11 additions and 3 deletions

View File

@ -16,7 +16,10 @@ go_library(
go_test( go_test(
name = "go_default_test", name = "go_default_test",
srcs = ["token_test.go"], srcs = [
"init_test.go",
"token_test.go",
],
args = ["--kubeadm-path=../../kubeadm"], args = ["--kubeadm-path=../../kubeadm"],
data = ["//cmd/kubeadm"], data = ["//cmd/kubeadm"],
library = ":go_default_library", library = ":go_default_library",

View File

@ -20,11 +20,16 @@ import "testing"
// kubeadmReset executes "kubeadm reset" and restarts kubelet. // kubeadmReset executes "kubeadm reset" and restarts kubelet.
func kubeadmReset() error { func kubeadmReset() error {
_, _, err := RunCmd(kubeadmPath, "reset") _, _, err := RunCmd(*kubeadmPath, "reset")
return err return err
} }
func TestCmdInitToken(t *testing.T) { func TestCmdInitToken(t *testing.T) {
if *kubeadmCmdSkip {
t.Log("kubeadm cmd tests being skipped")
t.Skip()
}
var initTest = []struct { var initTest = []struct {
args string args string
expected bool expected bool
@ -34,7 +39,7 @@ func TestCmdInitToken(t *testing.T) {
} }
for _, rt := range initTest { 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 { if (actual == nil) != rt.expected {
t.Errorf( t.Errorf(
"failed CmdInitToken running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t actual: %t", "failed CmdInitToken running 'kubeadm init %s' with an error: %v\n\texpected: %t\n\t actual: %t",