@@ -17,24 +17,28 @@ limitations under the License.
17
17
package cache
18
18
19
19
import (
20
- "reflect "
20
+ "context "
21
21
"testing"
22
22
23
23
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
+
26
25
corev1 "k8s.io/api/core/v1"
27
26
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28
27
"k8s.io/apimachinery/pkg/types"
28
+
29
+ tu "sigs.k8s.io/scheduler-plugins/test/util"
29
30
)
30
31
31
32
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
+ }
34
37
35
- nrtCache := NewDiscardReserved (fakeInformer .Lister ())
38
+ ctx := context .Background ()
39
+ nrtCache := NewDiscardReserved (fakeClient )
36
40
var nrtObj * topologyv1alpha2.NodeResourceTopology
37
- nrtObj , _ = nrtCache .GetCachedNRTCopy ("node1" , & corev1.Pod {})
41
+ nrtObj , _ = nrtCache .GetCachedNRTCopy (ctx , "node1" , & corev1.Pod {})
38
42
if nrtObj != nil {
39
43
t .Fatalf ("non-empty object from empty cache" )
40
44
}
@@ -66,12 +70,15 @@ func TestDiscardReservedNodesGetNRTCopy(t *testing.T) {
66
70
},
67
71
}
68
72
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
+ }
70
76
}
71
77
72
- nrtObj , ok := nrtCache .GetCachedNRTCopy ("node1" , & corev1.Pod {})
73
- if ! reflect .DeepEqual (nrtObj , nodeTopologies [0 ]) {
74
- t .Fatalf ("unexpected object from cache\n got: %s\n expected: %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\n got: %s\n expected: %s\n " ,
81
+ dumpNRT (nrtObj ), dumpNRT (nodeTopologies [0 ]))
75
82
}
76
83
77
84
if ! ok {
@@ -88,7 +95,7 @@ func TestDiscardReservedNodesGetNRTCopyFails(t *testing.T) {
88
95
},
89
96
}
90
97
91
- nrtObj , ok := nrtCache .GetCachedNRTCopy ("node1" , & corev1.Pod {})
98
+ nrtObj , ok := nrtCache .GetCachedNRTCopy (context . Background (), "node1" , & corev1.Pod {})
92
99
if ok {
93
100
t .Fatal ("expected false\n got true\n " )
94
101
}
0 commit comments