Skip to content

Commit

Permalink
Enable pod container resources tests on Windows
Browse files Browse the repository at this point in the history
PR kubernetes#112599 merged so it
seems that we can now enable the tests on Windows.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
  • Loading branch information
saschagrunert committed Nov 16, 2023
1 parent c3ff082 commit 2076429
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
8 changes: 0 additions & 8 deletions pkg/kubelet/kuberuntime/kuberuntime_container_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,6 @@ func TestToKubeContainerStatus(t *testing.T) {
// TestToKubeContainerStatusWithResources tests the converting the CRI container status to
// the internal type (i.e., toKubeContainerStatus()) for containers that returns Resources.
func TestToKubeContainerStatusWithResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)()
cid := &kubecontainer.ContainerID{Type: "testRuntime", ID: "dummyid"}
meta := &runtimeapi.ContainerMetadata{Name: "cname", Attempt: 3}
Expand Down Expand Up @@ -859,10 +855,6 @@ func TestKillContainerGracePeriod(t *testing.T) {

// TestUpdateContainerResources tests updating a container in a Pod.
func TestUpdateContainerResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
fakeRuntime, _, m, errCreate := createTestRuntimeManager()
require.NoError(t, errCreate)
pod := &v1.Pod{
Expand Down
5 changes: 0 additions & 5 deletions pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"fmt"
"path/filepath"
"reflect"
goruntime "runtime"
"sort"
"testing"
"time"
Expand Down Expand Up @@ -2466,10 +2465,6 @@ func TestComputePodActionsForPodResize(t *testing.T) {
}

func TestUpdatePodContainerResources(t *testing.T) {
// TODO: remove this check on this PR merges: https://github.com/kubernetes/kubernetes/pull/112599
if goruntime.GOOS == "windows" {
t.Skip("Updating Pod Container Resources is not supported on Windows.")
}
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.InPlacePodVerticalScaling, true)()
fakeRuntime, _, m, err := createTestRuntimeManager()
m.machineInfo.MemoryCapacity = 17179860387 // 16GB
Expand Down

0 comments on commit 2076429

Please sign in to comment.