Skip to content

Commit 4f943be

Browse files
committed
tests: migrate nrt tests to ctrl runtime
1 parent 6ed4997 commit 4f943be

File tree

10 files changed

+236
-122
lines changed

10 files changed

+236
-122
lines changed

pkg/noderesourcetopology/cache/discardreserved_test.go

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,28 @@ limitations under the License.
1717
package cache
1818

1919
import (
20-
"reflect"
20+
"context"
2121
"testing"
2222

2323
topologyv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha2"
24-
faketopologyv1alpha2 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/clientset/versioned/fake"
25-
topologyinformers "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/generated/informers/externalversions"
24+
2625
corev1 "k8s.io/api/core/v1"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"k8s.io/apimachinery/pkg/types"
28+
29+
tu "sigs.k8s.io/scheduler-plugins/test/util"
2930
)
3031

3132
func TestDiscardReservedNodesGetNRTCopy(t *testing.T) {
32-
fakeClient := faketopologyv1alpha2.NewSimpleClientset()
33-
fakeInformer := topologyinformers.NewSharedInformerFactory(fakeClient, 0).Topology().V1alpha2().NodeResourceTopologies()
33+
fakeClient, err := tu.NewFakeClient()
34+
if err != nil {
35+
t.Fatal(err)
36+
}
3437

35-
nrtCache := NewDiscardReserved(fakeInformer.Lister())
38+
ctx := context.Background()
39+
nrtCache := NewDiscardReserved(fakeClient)
3640
var nrtObj *topologyv1alpha2.NodeResourceTopology
37-
nrtObj, _ = nrtCache.GetCachedNRTCopy("node1", &corev1.Pod{})
41+
nrtObj, _ = nrtCache.GetCachedNRTCopy(ctx, "node1", &corev1.Pod{})
3842
if nrtObj != nil {
3943
t.Fatalf("non-empty object from empty cache")
4044
}
@@ -66,12 +70,15 @@ func TestDiscardReservedNodesGetNRTCopy(t *testing.T) {
6670
},
6771
}
6872
for _, obj := range nodeTopologies {
69-
fakeInformer.Informer().GetStore().Update(obj)
73+
if err := fakeClient.Create(ctx, obj.DeepCopy()); err != nil {
74+
t.Fatal(err)
75+
}
7076
}
7177

72-
nrtObj, ok := nrtCache.GetCachedNRTCopy("node1", &corev1.Pod{})
73-
if !reflect.DeepEqual(nrtObj, nodeTopologies[0]) {
74-
t.Fatalf("unexpected object from cache\ngot: %s\nexpected: %s\n", dumpNRT(nrtObj), dumpNRT(nodeTopologies[0]))
78+
nrtObj, ok := nrtCache.GetCachedNRTCopy(ctx, "node1", &corev1.Pod{})
79+
if !isNRTEqual(nrtObj, nodeTopologies[0]) {
80+
t.Fatalf("unexpected object from cache\ngot: %s\nexpected: %s\n",
81+
dumpNRT(nrtObj), dumpNRT(nodeTopologies[0]))
7582
}
7683

7784
if !ok {
@@ -88,7 +95,7 @@ func TestDiscardReservedNodesGetNRTCopyFails(t *testing.T) {
8895
},
8996
}
9097

91-
nrtObj, ok := nrtCache.GetCachedNRTCopy("node1", &corev1.Pod{})
98+
nrtObj, ok := nrtCache.GetCachedNRTCopy(context.Background(), "node1", &corev1.Pod{})
9299
if ok {
93100
t.Fatal("expected false\ngot true\n")
94101
}

0 commit comments

Comments
 (0)