mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-05 04:55:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use pointer types for metav1.Time fields (#1951)

Browse Source 
* use pointer types for metav1.Time fields

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>

* simpler metav1.Time ptrs

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>

* remove test debug println

Signed-off-by: Adnan Abdulhussein <aadnan@vmware.com>
This commit is contained in:
Adnan Abdulhussein
2019-10-14 09:20:28 -07:00
committed by Steve Kriss
parent 3fc4097231
commit e3d64d9dd9
29 changed files with 158 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/controller/schedule_controller_test.go
View File

@@ -174,7 +174,7 @@ func TestProcessSchedule(t *testing.T) {
t.Logf("error parsing status.lastBackup: %s\n", err)
return false, nil, err
}
res.Status.LastBackup = metav1.Time{Time: parsed}
res.Status.LastBackup = &metav1.Time{Time: parsed}
}
return true, res, nil
@@ -318,14 +318,21 @@ func TestGetNextRunTime(t *testing.T) {
offsetDuration, err := time.ParseDuration(test.lastRanOffset)
require.NoError(t, err, "unable to parse test.lastRanOffset: %v", err)
test.schedule.Status.LastBackup = metav1.Time{Time: testClock.Now().Add(-offsetDuration)}
test.schedule.Status.LastBackup = &metav1.Time{Time: testClock.Now().Add(-offsetDuration)}
}
nextRunTimeOffset, err := time.ParseDuration(test.expectedNextRunTimeOffset)
if err != nil {
panic(err)
}
expectedNextRunTime := test.schedule.Status.LastBackup.Add(nextRunTimeOffset)
// calculate expected next run time (if the schedule hasn't run yet, this
// will be the zero value which will trigger an immediate backup)
var baseTime time.Time
if test.lastRanOffset != "" {
baseTime = test.schedule.Status.LastBackup.Time
}
expectedNextRunTime := baseTime.Add(nextRunTimeOffset)
due, nextRunTime := getNextRunTime(test.schedule, cronSchedule, testClock.Now())
@@ -371,7 +378,7 @@ func TestParseCronSchedule(t *testing.T) {
assert.Equal(t, time.Date(2017, 8, 11, 9, 0, 0, 0, time.UTC), next)
// record backup time
s.Status.LastBackup = metav1.NewTime(now)
s.Status.LastBackup = &metav1.Time{Time: now}
// advance clock 1 minute, make sure we're not due and next backup is tomorrow at 9am
now = time.Date(2017, 8, 11, 9, 2, 0, 0, time.UTC)