From fa8afc1d393300803480e5faf4b6545916cd5ccf Mon Sep 17 00:00:00 2001 From: linweibin Date: Mon, 15 Jan 2018 16:02:35 +0800 Subject: [PATCH] Remove unused code in UT files in pkg/ --- .../providers/azure/azure_test.go | 50 ------------------- pkg/kubectl/cmd/BUILD | 1 - pkg/kubectl/cmd/attach_test.go | 6 +-- pkg/kubectl/cmd/drain_test.go | 16 ------ pkg/kubectl/cmd/exec_test.go | 6 +-- pkg/kubectl/cmd/logs_test.go | 4 +- pkg/kubectl/cmd/portforward_test.go | 8 +-- pkg/kubectl/cmd/resource/get_test.go | 11 ---- pkg/kubectl/cmd/taint_test.go | 1 - pkg/kubectl/cmd/top_pod_test.go | 2 - pkg/kubectl/namespace_test.go | 1 - pkg/kubectl/rolling_updater_test.go | 1 - pkg/kubelet/cm/cpumanager/BUILD | 1 - pkg/kubelet/cm/cpumanager/cpu_manager_test.go | 37 -------------- pkg/kubelet/cm/deviceplugin/manager_test.go | 5 -- pkg/kubelet/eviction/helpers_test.go | 18 +------ pkg/kubelet/kubelet_test.go | 2 - .../kuberuntime/kuberuntime_gc_test.go | 1 - .../kuberuntime/kuberuntime_manager_test.go | 6 --- pkg/kubelet/remote/remote_runtime_test.go | 7 --- pkg/kubelet/rkt/fake_rkt_interface_test.go | 1 - pkg/kubelet/stats/cri_stats_provider_test.go | 1 - pkg/kubelet/stats/stats_provider_test.go | 1 - pkg/master/BUILD | 5 -- pkg/master/master_test.go | 31 ------------ pkg/printers/humanreadable_test.go | 11 ---- pkg/printers/internalversion/describe_test.go | 4 +- .../apps/statefulset/storage/storage_test.go | 11 ---- pkg/registry/batch/cronjob/strategy_test.go | 6 --- .../core/endpoint/storage/storage_test.go | 10 ---- pkg/registry/core/event/strategy_test.go | 13 ----- .../persistentvolume/storage/storage_test.go | 5 -- pkg/registry/core/pod/strategy_test.go | 5 -- .../controller/storage/storage_test.go | 11 ---- .../storage/storage_test.go | 11 ---- .../storageclass/storage/storage_test.go | 4 -- .../volumeattachment/storage/storage_test.go | 4 -- pkg/security/podsecuritypolicy/group/BUILD | 5 +- .../podsecuritypolicy/group/mustrunas_test.go | 2 - pkg/serviceaccount/jwt_test.go | 11 ---- pkg/util/dbus/dbus_test.go | 7 +-- 41 files changed, 18 insertions(+), 325 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/pkg/cloudprovider/providers/azure/azure_test.go index 40a1153680..c42b9be3d0 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/pkg/cloudprovider/providers/azure/azure_test.go @@ -1000,23 +1000,6 @@ func getBackendPort(port int32) int32 { return port + 10000 } -func getTestPublicFipConfigurationProperties() network.FrontendIPConfigurationPropertiesFormat { - return network.FrontendIPConfigurationPropertiesFormat{ - PublicIPAddress: &network.PublicIPAddress{ID: to.StringPtr("/this/is/a/public/ip/address/id")}, - } -} - -func getTestInternalFipConfigurationProperties(expectedSubnetName *string) network.FrontendIPConfigurationPropertiesFormat { - var expectedSubnet *network.Subnet - if expectedSubnetName != nil { - expectedSubnet = &network.Subnet{Name: expectedSubnetName} - } - return network.FrontendIPConfigurationPropertiesFormat{ - PublicIPAddress: &network.PublicIPAddress{ID: to.StringPtr("/this/is/a/public/ip/address/id")}, - Subnet: expectedSubnet, - } -} - func getTestService(identifier string, proto v1.Protocol, requestedPorts ...int32) v1.Service { ports := []v1.ServicePort{} for _, port := range requestedPorts { @@ -1056,39 +1039,6 @@ func setLoadBalancerAutoModeAnnotation(service *v1.Service) { setLoadBalancerModeAnnotation(service, ServiceAnnotationLoadBalancerAutoModeValue) } -func getTestLoadBalancer(services ...v1.Service) network.LoadBalancer { - rules := []network.LoadBalancingRule{} - probes := []network.Probe{} - - for _, service := range services { - for _, port := range service.Spec.Ports { - ruleName := getLoadBalancerRuleName(&service, port, nil) - rules = append(rules, network.LoadBalancingRule{ - Name: to.StringPtr(ruleName), - LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{ - FrontendPort: to.Int32Ptr(port.Port), - BackendPort: to.Int32Ptr(port.Port), - }, - }) - probes = append(probes, network.Probe{ - Name: to.StringPtr(ruleName), - ProbePropertiesFormat: &network.ProbePropertiesFormat{ - Port: to.Int32Ptr(port.NodePort), - }, - }) - } - } - - lb := network.LoadBalancer{ - LoadBalancerPropertiesFormat: &network.LoadBalancerPropertiesFormat{ - LoadBalancingRules: &rules, - Probes: &probes, - }, - } - - return lb -} - func getServiceSourceRanges(service *v1.Service) []string { if len(service.Spec.LoadBalancerSourceRanges) == 0 { if !requiresInternalLoadBalancer(service) { diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 0bf3268983..d6cba425fe 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -207,7 +207,6 @@ go_test( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", deps = [ "//pkg/api/legacyscheme:go_default_library", - "//pkg/api/ref:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/testing:go_default_library", "//pkg/apis/batch:go_default_library", diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go index 42801a9b25..f4d9b1d5cd 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach_test.go @@ -286,9 +286,9 @@ func TestAttach(t *testing.T) { func TestAttachWarnings(t *testing.T) { version := legacyscheme.Registry.GroupOrDie(api.GroupName).GroupVersion.Version tests := []struct { - name, container, version, podPath, fetchPodPath, expectedErr, expectedOut string - pod *api.Pod - stdin, tty bool + name, container, version, podPath, fetchPodPath, expectedErr string + pod *api.Pod + stdin, tty bool }{ { name: "fallback tty if not supported", diff --git a/pkg/kubectl/cmd/drain_test.go b/pkg/kubectl/cmd/drain_test.go index f999631440..8efe31f8db 100644 --- a/pkg/kubectl/cmd/drain_test.go +++ b/pkg/kubectl/cmd/drain_test.go @@ -44,7 +44,6 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest/fake" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/api/ref" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" api "k8s.io/kubernetes/pkg/apis/core" @@ -882,18 +881,3 @@ func (m *MyReq) isFor(method string, path string) bool { req.URL.Path == strings.Join([]string{"/apis/extensions/v1beta1", path}, "") || req.URL.Path == strings.Join([]string{"/apis/batch/v1", path}, "")) } - -func refJson(t *testing.T, o runtime.Object) string { - ref, err := ref.GetReference(legacyscheme.Scheme, o) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - - _, _, codec, _ := cmdtesting.NewAPIFactory() - json, err := runtime.Encode(codec, &api.SerializedReference{Reference: *ref}) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - - return string(json) -} diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go index afa52ca634..c327b731b0 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec_test.go @@ -163,9 +163,9 @@ func TestPodAndContainer(t *testing.T) { func TestExec(t *testing.T) { version := "v1" tests := []struct { - name, podPath, execPath, container string - pod *api.Pod - execErr bool + name, podPath, execPath string + pod *api.Pod + execErr bool }{ { name: "pod exec", diff --git a/pkg/kubectl/cmd/logs_test.go b/pkg/kubectl/cmd/logs_test.go index be3dc7cab1..026b899f7c 100644 --- a/pkg/kubectl/cmd/logs_test.go +++ b/pkg/kubectl/cmd/logs_test.go @@ -34,8 +34,8 @@ import ( func TestLog(t *testing.T) { tests := []struct { - name, version, podPath, logPath, container string - pod *api.Pod + name, version, podPath, logPath string + pod *api.Pod }{ { name: "v1 - pod log", diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go index dcb6f1da82..e2437bcb62 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward_test.go @@ -47,10 +47,10 @@ func testPortForward(t *testing.T, flags map[string]string, args []string) { version := "v1" tests := []struct { - name string - podPath, pfPath, container string - pod *api.Pod - pfErr bool + name string + podPath, pfPath string + pod *api.Pod + pfErr bool }{ { name: "pod portforward", diff --git a/pkg/kubectl/cmd/resource/get_test.go b/pkg/kubectl/cmd/resource/get_test.go index 9d30530aa9..14a02d9e13 100644 --- a/pkg/kubectl/cmd/resource/get_test.go +++ b/pkg/kubectl/cmd/resource/get_test.go @@ -83,17 +83,6 @@ func defaultClientConfig() *restclient.Config { } } -func defaultClientConfigForVersion(version *schema.GroupVersion) *restclient.Config { - return &restclient.Config{ - APIPath: "/api", - ContentConfig: restclient.ContentConfig{ - NegotiatedSerializer: scheme.Codecs, - ContentType: runtime.ContentTypeJSON, - GroupVersion: version, - }, - } -} - type testPrinter struct { Objects []runtime.Object Err error diff --git a/pkg/kubectl/cmd/taint_test.go b/pkg/kubectl/cmd/taint_test.go index 8e90136494..172be9d309 100644 --- a/pkg/kubectl/cmd/taint_test.go +++ b/pkg/kubectl/cmd/taint_test.go @@ -84,7 +84,6 @@ func TestTaint(t *testing.T) { args []string expectFatal bool expectTaint bool - selector bool }{ // success cases { diff --git a/pkg/kubectl/cmd/top_pod_test.go b/pkg/kubectl/cmd/top_pod_test.go index 94bca7ec3e..a839454e2f 100644 --- a/pkg/kubectl/cmd/top_pod_test.go +++ b/pkg/kubectl/cmd/top_pod_test.go @@ -41,7 +41,6 @@ func TestTopPod(t *testing.T) { testNS := "testns" testCases := []struct { name string - namespace string flags map[string]string args []string expectedPath string @@ -176,7 +175,6 @@ func TestTopPodCustomDefaults(t *testing.T) { testNS := "custom-namespace" testCases := []struct { name string - namespace string flags map[string]string args []string expectedPath string diff --git a/pkg/kubectl/namespace_test.go b/pkg/kubectl/namespace_test.go index 2a017ba806..23b214225a 100644 --- a/pkg/kubectl/namespace_test.go +++ b/pkg/kubectl/namespace_test.go @@ -29,7 +29,6 @@ func TestNamespaceGenerate(t *testing.T) { params map[string]interface{} expected *v1.Namespace expectErr bool - index int }{ { params: map[string]interface{}{ diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 0bd04c6b18..3620ed0712 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -1260,7 +1260,6 @@ func TestFindSourceController(t *testing.T) { tests := []struct { list *api.ReplicationControllerList expectedController *api.ReplicationController - err error name string expectError bool }{ diff --git a/pkg/kubelet/cm/cpumanager/BUILD b/pkg/kubelet/cm/cpumanager/BUILD index d333008482..a270b6a052 100644 --- a/pkg/kubelet/cm/cpumanager/BUILD +++ b/pkg/kubelet/cm/cpumanager/BUILD @@ -47,7 +47,6 @@ go_test( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", ], ) diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go index 9381ea470b..704060fb38 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state" @@ -118,28 +117,6 @@ func (psp mockPodStatusProvider) GetPodStatus(uid types.UID) (v1.PodStatus, bool return psp.podStatus, psp.found } -type mockPodKiller struct { - killedPods []*v1.Pod -} - -func (f *mockPodKiller) killPodNow(pod *v1.Pod, status v1.PodStatus, gracePeriodOverride *int64) error { - f.killedPods = append(f.killedPods, pod) - return nil -} - -type mockPodProvider struct { - pods []*v1.Pod -} - -func (f *mockPodProvider) getPods() []*v1.Pod { - return f.pods -} - -type mockRecorder struct{} - -func (r *mockRecorder) Eventf(object runtime.Object, eventtype, reason, messageFmt string, args ...interface{}) { -} - func makePod(cpuRequest, cpuLimit string) *v1.Pod { return &v1.Pod{ Spec: v1.PodSpec{ @@ -161,20 +138,6 @@ func makePod(cpuRequest, cpuLimit string) *v1.Pod { } } -// CpuAllocatable must be <= CpuCapacity -func prepareCPUNodeStatus(CPUCapacity, CPUAllocatable string) v1.NodeStatus { - nodestatus := v1.NodeStatus{ - Capacity: make(v1.ResourceList, 1), - Allocatable: make(v1.ResourceList, 1), - } - cpucap, _ := resource.ParseQuantity(CPUCapacity) - cpuall, _ := resource.ParseQuantity(CPUAllocatable) - - nodestatus.Capacity[v1.ResourceCPU] = cpucap - nodestatus.Allocatable[v1.ResourceCPU] = cpuall - return nodestatus -} - func TestCPUManagerAdd(t *testing.T) { testCases := []struct { description string diff --git a/pkg/kubelet/cm/deviceplugin/manager_test.go b/pkg/kubelet/cm/deviceplugin/manager_test.go index 124f690acf..8fef628b86 100644 --- a/pkg/kubelet/cm/deviceplugin/manager_test.go +++ b/pkg/kubelet/cm/deviceplugin/manager_test.go @@ -233,11 +233,6 @@ func TestUpdateCapacityAllocatable(t *testing.T) { } -type stringPairType struct { - value1 string - value2 string -} - func constructDevices(devices []string) sets.String { ret := sets.NewString() for _, dev := range devices { diff --git a/pkg/kubelet/eviction/helpers_test.go b/pkg/kubelet/eviction/helpers_test.go index 727e0be14b..7b8f558066 100644 --- a/pkg/kubelet/eviction/helpers_test.go +++ b/pkg/kubelet/eviction/helpers_test.go @@ -1645,7 +1645,7 @@ func TestGetStarvedResources(t *testing.T) { } } -func testParsePercentage(t *testing.T) { +func TestParsePercentage(t *testing.T) { testCases := map[string]struct { hasError bool value float32 @@ -1674,7 +1674,7 @@ func testParsePercentage(t *testing.T) { } } -func testCompareThresholdValue(t *testing.T) { +func TestCompareThresholdValue(t *testing.T) { testCases := []struct { a, b evictionapi.ThresholdValue equal bool @@ -1831,20 +1831,6 @@ func newResourceList(cpu, memory, disk string) v1.ResourceList { return res } -func newEphemeralStorageResourceList(ephemeral, cpu, memory string) v1.ResourceList { - res := v1.ResourceList{} - if ephemeral != "" { - res[v1.ResourceEphemeralStorage] = resource.MustParse(ephemeral) - } - if cpu != "" { - res[v1.ResourceCPU] = resource.MustParse(cpu) - } - if memory != "" { - res[v1.ResourceMemory] = resource.MustParse("1Mi") - } - return res -} - func newResourceRequirements(requests, limits v1.ResourceList) v1.ResourceRequirements { res := v1.ResourceRequirements{} res.Requests = requests diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index c1061355ba..ea0172ce14 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -334,8 +334,6 @@ func newTestPods(count int) []*v1.Pod { return pods } -var emptyPodUIDs map[types.UID]kubetypes.SyncPodType - func TestSyncLoopAbort(t *testing.T) { testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */) defer testKubelet.Cleanup() diff --git a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go index 780d47f9b7..ebd306fd75 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_gc_test.go @@ -65,7 +65,6 @@ func TestSandboxGC(t *testing.T) { description string // description of the test case sandboxes []sandboxTemplate // templates of sandboxes containers []containerTemplate // templates of containers - minAge time.Duration // sandboxMinGCAge remain []int // template indexes of remaining sandboxes evictTerminatedPods bool }{ diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go index 85a06794ee..b8e3e55d86 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager_test.go @@ -225,12 +225,6 @@ func verifyFakeContainerList(fakeRuntime *apitest.FakeRuntimeService, expected s return actual, actual.Equal(expected) } -type containerRecord struct { - container *v1.Container - attempt uint32 - state runtimeapi.ContainerState -} - // Only extract the fields of interests. type cRecord struct { name string diff --git a/pkg/kubelet/remote/remote_runtime_test.go b/pkg/kubelet/remote/remote_runtime_test.go index db5b31b6bf..2f26efc3da 100644 --- a/pkg/kubelet/remote/remote_runtime_test.go +++ b/pkg/kubelet/remote/remote_runtime_test.go @@ -50,13 +50,6 @@ func createRemoteRuntimeService(endpoint string, t *testing.T) internalapi.Runti return runtimeService } -func createRemoteImageService(endpoint string, t *testing.T) internalapi.ImageManagerService { - imageService, err := NewRemoteImageService(endpoint, defaultConnectionTimeout) - assert.NoError(t, err) - - return imageService -} - func TestVersion(t *testing.T) { fakeRuntime, endpoint := createAndStartFakeRemoteRuntime(t) defer fakeRuntime.Stop() diff --git a/pkg/kubelet/rkt/fake_rkt_interface_test.go b/pkg/kubelet/rkt/fake_rkt_interface_test.go index 19b3665685..2ee7bdcdd6 100644 --- a/pkg/kubelet/rkt/fake_rkt_interface_test.go +++ b/pkg/kubelet/rkt/fake_rkt_interface_test.go @@ -195,7 +195,6 @@ func (f *fakePodDeletionProvider) IsPodDeleted(uid types.UID) bool { type fakeUnitGetter struct { networkNamespace kubecontainer.ContainerID - callServices []string } func newfakeUnitGetter() *fakeUnitGetter { diff --git a/pkg/kubelet/stats/cri_stats_provider_test.go b/pkg/kubelet/stats/cri_stats_provider_test.go index 5cff0ac7e9..931b368ec5 100644 --- a/pkg/kubelet/stats/cri_stats_provider_test.go +++ b/pkg/kubelet/stats/cri_stats_provider_test.go @@ -38,7 +38,6 @@ import ( func TestCRIListPodStats(t *testing.T) { const ( seedRoot = 0 - seedRuntime = 100 seedKubelet = 200 seedMisc = 300 seedSandbox0 = 1000 diff --git a/pkg/kubelet/stats/stats_provider_test.go b/pkg/kubelet/stats/stats_provider_test.go index 6f02704ed5..1ff7f6524b 100644 --- a/pkg/kubelet/stats/stats_provider_test.go +++ b/pkg/kubelet/stats/stats_provider_test.go @@ -59,7 +59,6 @@ const ( offsetFsTotalUsageBytes offsetFsBaseUsageBytes offsetFsInodeUsage - offsetVolume ) var ( diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 3162a764c3..fadfc10b42 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -145,13 +145,8 @@ go_test( "//vendor/github.com/go-openapi/strfmt:go_default_library", "//vendor/github.com/go-openapi/validate:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", - "//vendor/k8s.io/api/apps/v1beta1:go_default_library", - "//vendor/k8s.io/api/autoscaling/v1:go_default_library", - "//vendor/k8s.io/api/batch/v1:go_default_library", - "//vendor/k8s.io/api/batch/v1beta1:go_default_library", "//vendor/k8s.io/api/certificates/v1beta1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 506b81f9f6..2d8d8c4f3e 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -27,13 +27,8 @@ import ( "strings" "testing" - appsapiv1beta1 "k8s.io/api/apps/v1beta1" - autoscalingapiv1 "k8s.io/api/autoscaling/v1" - batchapiv1 "k8s.io/api/batch/v1" - batchapiv1beta1 "k8s.io/api/batch/v1beta1" certificatesapiv1beta1 "k8s.io/api/certificates/v1beta1" apiv1 "k8s.io/api/core/v1" - extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -194,32 +189,6 @@ func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *ass return master, etcdserver, config, assert } -// limitedAPIResourceConfigSource only enables the core group, the extensions group, the batch group, and the autoscaling group. -func limitedAPIResourceConfigSource() *serverstorage.ResourceConfig { - ret := serverstorage.NewResourceConfig() - ret.EnableVersions( - apiv1.SchemeGroupVersion, - extensionsapiv1beta1.SchemeGroupVersion, - batchapiv1.SchemeGroupVersion, - batchapiv1beta1.SchemeGroupVersion, - appsapiv1beta1.SchemeGroupVersion, - autoscalingapiv1.SchemeGroupVersion, - ) - return ret -} - -// newLimitedMaster only enables the core group, the extensions group, the batch group, and the autoscaling group. -func newLimitedMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) { - etcdserver, config, sharedInformers, assert := setUp(t) - config.ExtraConfig.APIResourceConfigSource = limitedAPIResourceConfigSource() - master, err := config.Complete(sharedInformers).New(genericapiserver.EmptyDelegate) - if err != nil { - t.Fatalf("Error in bringing up the master: %v", err) - } - - return master, etcdserver, config, assert -} - // TestVersion tests /version func TestVersion(t *testing.T) { s, etcdserver, _, _ := newMaster(t) diff --git a/pkg/printers/humanreadable_test.go b/pkg/printers/humanreadable_test.go index 7c45b868e3..779f6b748c 100644 --- a/pkg/printers/humanreadable_test.go +++ b/pkg/printers/humanreadable_test.go @@ -45,17 +45,6 @@ func testPrintNamespace(obj *api.Namespace, options PrintOptions) ([]metav1alpha return []metav1alpha1.TableRow{row}, nil } -func testPrintNamespaceList(list *api.NamespaceList, options PrintOptions) ([]metav1alpha1.TableRow, error) { - rows := make([]metav1alpha1.TableRow, 0, len(list.Items)) - for i := range list.Items { - r, err := testPrintNamespace(&list.Items[i], options) - if err != nil { - return nil, err - } - rows = append(rows, r...) - } - return rows, nil -} func TestPrintRowsForHandlerEntry(t *testing.T) { printFunc := reflect.ValueOf(testPrintNamespace) diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go index 71dfd3f05f..54947d5974 100644 --- a/pkg/printers/internalversion/describe_test.go +++ b/pkg/printers/internalversion/describe_test.go @@ -783,8 +783,8 @@ func TestDefaultDescribers(t *testing.T) { func TestGetPodsTotalRequests(t *testing.T) { testCases := []struct { - pods *api.PodList - expectedReqs, expectedLimits map[api.ResourceName]resource.Quantity + pods *api.PodList + expectedReqs map[api.ResourceName]resource.Quantity }{ { pods: &api.PodList{ diff --git a/pkg/registry/apps/statefulset/storage/storage_test.go b/pkg/registry/apps/statefulset/storage/storage_test.go index 1e2d13ed84..ad98dd1ed4 100644 --- a/pkg/registry/apps/statefulset/storage/storage_test.go +++ b/pkg/registry/apps/statefulset/storage/storage_test.go @@ -44,17 +44,6 @@ func newStorage(t *testing.T) (StatefulSetStorage, *etcdtesting.EtcdTestServer) return storage, server } -// createStatefulSet is a helper function that returns a StatefulSet with the updated resource version. -func createStatefulSet(storage *REST, ps apps.StatefulSet, t *testing.T) (apps.StatefulSet, error) { - ctx := genericapirequest.WithNamespace(genericapirequest.NewContext(), ps.Namespace) - obj, err := storage.Create(ctx, &ps, rest.ValidateAllObjectFunc, false) - if err != nil { - t.Errorf("Failed to create StatefulSet, %v", err) - } - newPS := obj.(*apps.StatefulSet) - return *newPS, nil -} - func validNewStatefulSet() *apps.StatefulSet { return &apps.StatefulSet{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/registry/batch/cronjob/strategy_test.go b/pkg/registry/batch/cronjob/strategy_test.go index 6cf9b60b58..0b46ac9f86 100644 --- a/pkg/registry/batch/cronjob/strategy_test.go +++ b/pkg/registry/batch/cronjob/strategy_test.go @@ -26,12 +26,6 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" ) -func newBool(a bool) *bool { - r := new(bool) - *r = a - return r -} - func TestCronJobStrategy(t *testing.T) { ctx := genericapirequest.NewDefaultContext() if !Strategy.NamespaceScoped() { diff --git a/pkg/registry/core/endpoint/storage/storage_test.go b/pkg/registry/core/endpoint/storage/storage_test.go index a511424a09..bf7b366f10 100644 --- a/pkg/registry/core/endpoint/storage/storage_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -54,16 +54,6 @@ func validNewEndpoints() *api.Endpoints { } } -func validChangedEndpoints() *api.Endpoints { - endpoints := validNewEndpoints() - endpoints.ResourceVersion = "1" - endpoints.Subsets = []api.EndpointSubset{{ - Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}}, - Ports: []api.EndpointPort{{Port: 80, Protocol: "TCP"}}, - }} - return endpoints -} - func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) diff --git a/pkg/registry/core/event/strategy_test.go b/pkg/registry/core/event/strategy_test.go index e95df8a0f8..fe1763798b 100644 --- a/pkg/registry/core/event/strategy_test.go +++ b/pkg/registry/core/event/strategy_test.go @@ -31,19 +31,6 @@ import ( _ "k8s.io/kubernetes/pkg/api/testapi" ) -func testEvent(name string) *api.Event { - return &api.Event{ - ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: "default", - }, - InvolvedObject: api.ObjectReference{ - Namespace: "default", - }, - Reason: "forTesting", - } -} - func TestGetAttrs(t *testing.T) { eventA := &api.Event{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index 95c90eede9..489569cca4 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -77,11 +77,6 @@ func validNewPersistentVolume(name string) *api.PersistentVolume { return pv } -func validChangedPersistentVolume() *api.PersistentVolume { - pv := validNewPersistentVolume("foo") - return pv -} - func TestCreate(t *testing.T) { storage, _, server := newStorage(t) defer server.Terminate(t) diff --git a/pkg/registry/core/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go index 8d10e6a6ee..d013292635 100644 --- a/pkg/registry/core/pod/strategy_test.go +++ b/pkg/registry/core/pod/strategy_test.go @@ -138,11 +138,6 @@ func getResourceList(cpu, memory string) api.ResourceList { return res } -func addResource(rName, value string, rl api.ResourceList) api.ResourceList { - rl[api.ResourceName(rName)] = resource.MustParse(value) - return rl -} - func getResourceRequirements(requests, limits api.ResourceList) api.ResourceRequirements { res := api.ResourceRequirements{} res.Requests = requests diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index 62689035fb..c969bb5c3e 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -74,17 +74,6 @@ var validController = api.ReplicationController{ Spec: validControllerSpec, } -var validScale = autoscaling.Scale{ - ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "test"}, - Spec: autoscaling.ScaleSpec{ - Replicas: validReplicas, - }, - Status: autoscaling.ScaleStatus{ - Replicas: 0, - Selector: "a=b", - }, -} - func TestGet(t *testing.T) { storage, _, si, destroyFunc := newStorage(t) defer destroyFunc() diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index 4c67d4ca3d..c11b579875 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -39,17 +39,6 @@ func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) return podDisruptionBudgetStorage, statusStorage, server } -// createPodDisruptionBudget is a helper function that returns a PodDisruptionBudget with the updated resource version. -func createPodDisruptionBudget(storage *REST, pdb policy.PodDisruptionBudget, t *testing.T) (policy.PodDisruptionBudget, error) { - ctx := genericapirequest.WithNamespace(genericapirequest.NewContext(), pdb.Namespace) - obj, err := storage.Create(ctx, &pdb, rest.ValidateAllObjectFunc, false) - if err != nil { - t.Errorf("Failed to create PodDisruptionBudget, %v", err) - } - newPS := obj.(*policy.PodDisruptionBudget) - return *newPS, nil -} - func validNewPodDisruptionBudget() *policy.PodDisruptionBudget { minAvailable := intstr.FromInt(7) return &policy.PodDisruptionBudget{ diff --git a/pkg/registry/storage/storageclass/storage/storage_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go index 9a5dd86695..aaca94134f 100644 --- a/pkg/registry/storage/storageclass/storage/storage_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -57,10 +57,6 @@ func validNewStorageClass(name string) *storageapi.StorageClass { } } -func validChangedStorageClass() *storageapi.StorageClass { - return validNewStorageClass("foo") -} - func TestCreate(t *testing.T) { storage, server := newStorage(t) defer server.Terminate(t) diff --git a/pkg/registry/storage/volumeattachment/storage/storage_test.go b/pkg/registry/storage/volumeattachment/storage/storage_test.go index 669e319155..540255de89 100644 --- a/pkg/registry/storage/volumeattachment/storage/storage_test.go +++ b/pkg/registry/storage/volumeattachment/storage/storage_test.go @@ -60,10 +60,6 @@ func validNewVolumeAttachment(name string) *storageapi.VolumeAttachment { } } -func validChangedVolumeAttachment() *storageapi.VolumeAttachment { - return validNewVolumeAttachment("foo") -} - func TestCreate(t *testing.T) { if *testapi.Storage.GroupVersion() != storageapiv1alpha1.SchemeGroupVersion { // skip the test for all versions exception v1alpha1 diff --git a/pkg/security/podsecuritypolicy/group/BUILD b/pkg/security/podsecuritypolicy/group/BUILD index 601e7476de..95be975197 100644 --- a/pkg/security/podsecuritypolicy/group/BUILD +++ b/pkg/security/podsecuritypolicy/group/BUILD @@ -31,10 +31,7 @@ go_test( ], embed = [":go_default_library"], importpath = "k8s.io/kubernetes/pkg/security/podsecuritypolicy/group", - deps = [ - "//pkg/apis/core:go_default_library", - "//pkg/apis/extensions:go_default_library", - ], + deps = ["//pkg/apis/extensions:go_default_library"], ) filegroup( diff --git a/pkg/security/podsecuritypolicy/group/mustrunas_test.go b/pkg/security/podsecuritypolicy/group/mustrunas_test.go index 395ffd80eb..c0347672e6 100644 --- a/pkg/security/podsecuritypolicy/group/mustrunas_test.go +++ b/pkg/security/podsecuritypolicy/group/mustrunas_test.go @@ -17,7 +17,6 @@ limitations under the License. package group import ( - api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/extensions" "testing" ) @@ -110,7 +109,6 @@ func TestGenerate(t *testing.T) { func TestValidate(t *testing.T) { tests := map[string]struct { ranges []extensions.GroupIDRange - pod *api.Pod groups []int64 pass bool }{ diff --git a/pkg/serviceaccount/jwt_test.go b/pkg/serviceaccount/jwt_test.go index 076f4ade98..e21af9584d 100644 --- a/pkg/serviceaccount/jwt_test.go +++ b/pkg/serviceaccount/jwt_test.go @@ -80,17 +80,6 @@ X024wzbiw1q07jFCyfQmODzURAx1VNT7QVUMdz/N8vy47/H40AZJ -----END RSA PRIVATE KEY----- ` -// openssl ecparam -name prime256v1 -genkey -out ecdsa256params.pem -const ecdsaPrivateKeyWithParams = `-----BEGIN EC PARAMETERS----- -BggqhkjOPQMBBw== ------END EC PARAMETERS----- ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIJ9LWDj3ZWe9CksPV7mZjD2dYXG9icfzxadCRwd3vr1toAoGCCqGSM49 -AwEHoUQDQgAEaLNEpzbaaNTCkKjBVj7sxpfJ1ifJQGNvcck4nrzcwFRuujwVDDJh -95iIGwKCQeSg+yhdN6Q/p2XaxNIZlYmUhg== ------END EC PRIVATE KEY----- -` - // openssl ecparam -name prime256v1 -genkey -noout -out ecdsa256.pem const ecdsaPrivateKey = `-----BEGIN EC PRIVATE KEY----- MHcCAQEEIEZmTmUhuanLjPA2CLquXivuwBDHTt5XYwgIr/kA1LtRoAoGCCqGSM49 diff --git a/pkg/util/dbus/dbus_test.go b/pkg/util/dbus/dbus_test.go index 3f22d5982f..359f6fbd86 100644 --- a/pkg/util/dbus/dbus_test.go +++ b/pkg/util/dbus/dbus_test.go @@ -25,21 +25,16 @@ import ( ) const ( - DBusNameFlagAllowReplacement uint32 = 1 << (iota + 1) - DBusNameFlagReplaceExisting - DBusNameFlagDoNotQueue + DBusNameFlagDoNotQueue uint32 = 1 << (iota + 1) ) const ( DBusRequestNameReplyPrimaryOwner uint32 = iota + 1 - DBusRequestNameReplyInQueue - DBusRequestNameReplyExists DBusRequestNameReplyAlreadyOwner ) const ( DBusReleaseNameReplyReleased uint32 = iota + 1 - DBusReleaseNameReplyNonExistent DBusReleaseNameReplyNotOwner )