diff --git a/upup/pkg/fi/nodeup/nodetasks/loadimage_test.go b/upup/pkg/fi/nodeup/nodetasks/loadimage_test.go new file mode 100644 index 0000000000..2d53e5d531 --- /dev/null +++ b/upup/pkg/fi/nodeup/nodetasks/loadimage_test.go @@ -0,0 +1,40 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package nodetasks + +import ( + "k8s.io/kops/upup/pkg/fi" + "reflect" + "testing" +) + +func TestLoadImageTask_Deps(t *testing.T) { + l := &LoadImageTask{} + + tasks := make(map[string]fi.Task) + tasks["LoadImageTask1"] = &LoadImageTask{} + tasks["FileTask1"] = &File{} + tasks["ServiceDocker"] = &Service{Name: "docker.service"} + tasks["Service2"] = &Service{Name: "two.service"} + + deps := l.GetDependencies(tasks) + expected := []fi.Task{tasks["ServiceDocker"]} + if !reflect.DeepEqual(expected, deps) { + t.Fatalf("unexpected deps. expected=%v, actual=%v", expected, deps) + } + +} diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go index bd4f387a7d..ab58462663 100644 --- a/upup/pkg/fi/nodeup/nodetasks/service.go +++ b/upup/pkg/fi/nodeup/nodetasks/service.go @@ -69,7 +69,7 @@ func (p *Service) GetDependencies(tasks map[string]fi.Task) []fi.Task { case *Service, *LoadImageTask: // ignore default: - glog.Warningf("Unhandled type %t in Service::GetDependencies: %v", v, v) + glog.Warningf("Unhandled type %T in Service::GetDependencies: %v", v, v) deps = append(deps, v) } } diff --git a/upup/pkg/fi/nodeup/nodetasks/service_test.go b/upup/pkg/fi/nodeup/nodetasks/service_test.go new file mode 100644 index 0000000000..99de69779f --- /dev/null +++ b/upup/pkg/fi/nodeup/nodetasks/service_test.go @@ -0,0 +1,56 @@ +/* +Copyright 2016 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package nodetasks + +import ( + "k8s.io/kops/upup/pkg/fi" + "reflect" + "testing" +) + +func TestServiceTask_Deps(t *testing.T) { + s := &Service{} + + tasks := make(map[string]fi.Task) + tasks["LoadImageTask1"] = &LoadImageTask{} + tasks["FileTask1"] = &File{} + + deps := s.GetDependencies(tasks) + expected := []fi.Task{tasks["FileTask1"]} + if !reflect.DeepEqual(expected, deps) { + t.Fatalf("unexpected deps. expected=%v, actual=%v", expected, deps) + } +} + +type FakeTask struct { +} + +func (t *FakeTask) Run(*fi.Context) error { + panic("not implemented") +} +func TestServiceTask_UnknownTypes(t *testing.T) { + s := &Service{} + + tasks := make(map[string]fi.Task) + tasks["FakeTask1"] = &FakeTask{} + + deps := s.GetDependencies(tasks) + expected := []fi.Task{tasks["FakeTask1"]} + if !reflect.DeepEqual(expected, deps) { + t.Fatalf("unexpected deps. expected=%v, actual=%v", expected, deps) + } +}