@@ -7,10 +7,10 @@ import (
7
7
"path/filepath"
8
8
"reflect"
9
9
"testing"
10
- "time"
11
10
12
11
batchv1 "k8s.io/api/batch/v1"
13
12
corev1 "k8s.io/api/core/v1"
13
+ k8serrors "k8s.io/apimachinery/pkg/api/errors"
14
14
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15
15
"k8s.io/apimachinery/pkg/runtime"
16
16
"k8s.io/apimachinery/pkg/types"
@@ -266,7 +266,6 @@ func TestCheckFinalizers(t *testing.T) {
266
266
267
267
for _ , tt := range tests {
268
268
t .Run (tt .name , func (t * testing.T ) {
269
- tt .cr .DeletionTimestamp = & metav1.Time {Time : time .Now ()}
270
269
tt .cr .Status .Storage = storage
271
270
272
271
job := xtrabackup .GetDeleteJob (tt .cr , new (xtrabackup.BackupConfig ))
@@ -285,9 +284,20 @@ func TestCheckFinalizers(t *testing.T) {
285
284
Scheme : scheme ,
286
285
ServerVersion : & platform.ServerVersion {Platform : platform .PlatformKubernetes },
287
286
}
287
+ err := r .Delete (ctx , tt .cr )
288
+ if err != nil {
289
+ t .Fatal (err )
290
+ }
291
+ cr := new (apiv1alpha1.PerconaServerMySQLBackup )
292
+ if err := r .Get (ctx , types.NamespacedName {Name : tt .cr .Name , Namespace : tt .cr .Namespace }, cr ); err != nil {
293
+ if k8serrors .IsNotFound (err ) && len (cr .Finalizers ) == 0 {
294
+ return
295
+ }
296
+ t .Fatal (err )
297
+ }
288
298
289
- r .checkFinalizers (ctx , tt . cr )
290
- if ! reflect .DeepEqual (tt . cr .Finalizers , tt .expectedFinalizers ) {
299
+ r .checkFinalizers (ctx , cr )
300
+ if ! reflect .DeepEqual (cr .Finalizers , tt .expectedFinalizers ) {
291
301
t .Fatalf ("expected finalizers %v, got %v" , tt .expectedFinalizers , tt .cr .Finalizers )
292
302
}
293
303
})
0 commit comments