From fd7bb771f9e1dfd0768fed580e67102cc954bde7 Mon Sep 17 00:00:00 2001 From: pacoxu Date: Mon, 12 Apr 2021 14:29:55 +0800 Subject: [PATCH] skip linux ut on mac in pkg/kubelet/dockershim Signed-off-by: pacoxu --- .../dockershim/docker_sandbox_linux_test.go | 38 +++++++++++++++++++ pkg/kubelet/dockershim/docker_sandbox_test.go | 13 ------- pkg/kubelet/dockershim/docker_stats_test.go | 2 +- 3 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 pkg/kubelet/dockershim/docker_sandbox_linux_test.go diff --git a/pkg/kubelet/dockershim/docker_sandbox_linux_test.go b/pkg/kubelet/dockershim/docker_sandbox_linux_test.go new file mode 100644 index 00000000000..ace2749a9d5 --- /dev/null +++ b/pkg/kubelet/dockershim/docker_sandbox_linux_test.go @@ -0,0 +1,38 @@ +// +build linux,!dockerless + +/* +Copyright 2021 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 dockershim + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +// TestSandboxHasLeastPrivilegesConfig tests that the sandbox is set with no-new-privileges +// and it uses runtime/default seccomp profile. +func TestSandboxHasLeastPrivilegesConfig(t *testing.T) { + ds, _, _ := newTestDockerService() + config := makeSandboxConfig("foo", "bar", "1", 0) + + // test the default + createConfig, err := ds.makeSandboxDockerConfig(config, defaultSandboxImage) + assert.NoError(t, err) + assert.Equal(t, len(createConfig.HostConfig.SecurityOpt), 1, "sandbox should use runtime/default") + assert.Equal(t, "no-new-privileges", createConfig.HostConfig.SecurityOpt[0], "no-new-privileges not set") +} diff --git a/pkg/kubelet/dockershim/docker_sandbox_test.go b/pkg/kubelet/dockershim/docker_sandbox_test.go index ae598dddaf3..9d385a5f089 100644 --- a/pkg/kubelet/dockershim/docker_sandbox_test.go +++ b/pkg/kubelet/dockershim/docker_sandbox_test.go @@ -156,19 +156,6 @@ func TestSandboxStatus(t *testing.T) { assert.Error(t, err, fmt.Sprintf("status of sandbox: %+v", statusResp)) } -// TestSandboxHasLeastPrivilegesConfig tests that the sandbox is set with no-new-privileges -// and it uses runtime/default seccomp profile. -func TestSandboxHasLeastPrivilegesConfig(t *testing.T) { - ds, _, _ := newTestDockerService() - config := makeSandboxConfig("foo", "bar", "1", 0) - - // test the default - createConfig, err := ds.makeSandboxDockerConfig(config, defaultSandboxImage) - assert.NoError(t, err) - assert.Equal(t, len(createConfig.HostConfig.SecurityOpt), 1, "sandbox should use runtime/default") - assert.Equal(t, "no-new-privileges", createConfig.HostConfig.SecurityOpt[0], "no-new-privileges not set") -} - // TestSandboxStatusAfterRestart tests that retrieving sandbox status returns // an IP address even if RunPodSandbox() was not yet called for this pod, as // would happen on kubelet restart diff --git a/pkg/kubelet/dockershim/docker_stats_test.go b/pkg/kubelet/dockershim/docker_stats_test.go index fa2d1559b53..5710931dde2 100644 --- a/pkg/kubelet/dockershim/docker_stats_test.go +++ b/pkg/kubelet/dockershim/docker_stats_test.go @@ -1,4 +1,4 @@ -// +build !dockerless +// +build linux,!dockerless /* Copyright 2019 The Kubernetes Authors.