mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-07-28 11:02:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace k8s.io/apimachinery/pkg/util/clock with k8s.io/utils/clock

Browse Source 
Signed-off-by: Zhizhen He <hezhizhen.yi@gmail.com>
This commit is contained in:
Zhizhen He
2023-02-21 11:56:17 +08:00
parent 5f039b7f7c
commit fb1dc110f2
19 changed files with 89 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/backup_controller_test.go
+8 -8
View File
@@ -21,7 +21,6 @@ import (
"context"
"fmt"
"io"
"sort"
"strings"
"testing"
@@ -37,8 +36,9 @@ import (
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/clock"
"k8s.io/apimachinery/pkg/version"
clocks "k8s.io/utils/clock"
testclocks "k8s.io/utils/clock/testing"
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
@@ -213,7 +213,7 @@ func TestProcessBackupValidationFailures(t *testing.T) {
kbClient: fakeClient,
snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
defaultBackupLocation: defaultBackupLocation.Name,
clock: &clock.RealClock{},
clock: &clocks.RealClock{},
formatFlag: formatFlag,
}
@@ -280,7 +280,7 @@ func TestBackupLocationLabel(t *testing.T) {
kbClient: fakeClient,
snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
defaultBackupLocation: test.backupLocation.Name,
clock: &clock.RealClock{},
clock: &clocks.RealClock{},
formatFlag: formatFlag,
}
@@ -378,7 +378,7 @@ func Test_prepareBackupRequest_BackupStorageLocation(t *testing.T) {
kbClient: fakeClient,
snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
defaultBackupTTL: defaultBackupTTL.Duration,
clock: clock.NewFakeClock(now),
clock: testclocks.NewFakeClock(now),
formatFlag: formatFlag,
}
@@ -453,7 +453,7 @@ func TestDefaultBackupTTL(t *testing.T) {
kbClient: fakeClient,
snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
defaultBackupTTL: defaultBackupTTL.Duration,
clock: clock.NewFakeClock(now),
clock: testclocks.NewFakeClock(now),
formatFlag: formatFlag,
}
@@ -557,7 +557,7 @@ func TestDefaultVolumesToResticDeprecation(t *testing.T) {
lister: sharedInformers.Velero().V1().Backups().Lister(),
kbClient: fakeClient,
snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
clock: &clock.RealClock{},
clock: &clocks.RealClock{},
formatFlag: formatFlag,
defaultVolumesToFsBackup: test.globalVal,
}
@@ -1063,7 +1063,7 @@ func TestProcessBackupCompletions(t *testing.T) {
defaultVolumesToFsBackup: test.defaultVolumesToFsBackup,
backupTracker: NewBackupTracker(),
metrics: metrics.NewServerMetrics(),
clock: clock.NewFakeClock(now),
clock: testclocks.NewFakeClock(now),
newPluginManager: func(logrus.FieldLogger) clientmgmt.Manager { return pluginManager },
backupStoreGetter: NewFakeSingleObjectBackupStoreGetter(backupStore),
backupper: backupper,