Skip to content

Commit c26c59a

Browse files
authored
Merge pull request kubernetes#130124 from marosset/windows-unit-tests-memory-manager-fixes
fixing k8s.io/kubernetes/pkg/kubelet/cm/memorymanager unit tests on Windows
2 parents d7774fc + 569eb41 commit c26c59a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pkg/kubelet/cm/memorymanager/memory_manager_test.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"fmt"
2222
"os"
2323
"reflect"
24+
goruntime "runtime"
2425
"strings"
2526
"testing"
2627

@@ -1896,6 +1897,13 @@ func TestRemoveContainer(t *testing.T) {
18961897
}
18971898
}
18981899

1900+
func getPolicyNameForOs() policyType {
1901+
if goruntime.GOOS == "windows" {
1902+
return policyTypeBestEffort
1903+
}
1904+
return policyTypeStatic
1905+
}
1906+
18991907
func TestNewManager(t *testing.T) {
19001908
machineInfo := returnMachineInfo()
19011909
expectedReserved := systemReservedMemory{
@@ -1909,7 +1917,7 @@ func TestNewManager(t *testing.T) {
19091917
testCases := []testMemoryManager{
19101918
{
19111919
description: "Successful creation of Memory Manager instance",
1912-
policyName: policyTypeStatic,
1920+
policyName: getPolicyNameForOs(),
19131921
machineInfo: machineInfo,
19141922
nodeAllocatableReservation: v1.ResourceList{v1.ResourceMemory: *resource.NewQuantity(2*gb, resource.BinarySI)},
19151923
systemReservedMemory: []kubeletconfig.MemoryReservation{
@@ -1928,7 +1936,7 @@ func TestNewManager(t *testing.T) {
19281936
},
19291937
{
19301938
description: "Should return an error when systemReservedMemory (configured with kubelet flag) does not comply with Node Allocatable feature values",
1931-
policyName: policyTypeStatic,
1939+
policyName: getPolicyNameForOs(),
19321940
machineInfo: machineInfo,
19331941
nodeAllocatableReservation: v1.ResourceList{v1.ResourceMemory: *resource.NewQuantity(2*gb, resource.BinarySI)},
19341942
systemReservedMemory: []kubeletconfig.MemoryReservation{
@@ -1951,7 +1959,7 @@ func TestNewManager(t *testing.T) {
19511959
},
19521960
{
19531961
description: "Should return an error when memory reserved for system is empty (systemReservedMemory)",
1954-
policyName: policyTypeStatic,
1962+
policyName: getPolicyNameForOs(),
19551963
machineInfo: machineInfo,
19561964
nodeAllocatableReservation: v1.ResourceList{},
19571965
systemReservedMemory: []kubeletconfig.MemoryReservation{},

0 commit comments

Comments
 (0)