vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use NoError instead of NoErrorf 

Prepping to roll back to the same version of testify that client-go
uses, and that does not have NoErrorf.

Signed-off-by: Andy Goldstein <andy.goldstein@gmail.com>
pull/11/head
Andy Goldstein 2017-08-07 11:20:38 -04:00
parent 045e5380d2
commit 2c9d22771c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/backup_controller_test.go
View File

@ -207,7 +207,7 @@ func TestProcessBackup(t *testing.T) {
require.Error(t, err, "processBackup should error")
return
}
require.NoErrorf(t, err, "processBackup unexpected error: %v", err)
require.NoError(t, err, "processBackup unexpected error: %v", err)
if !test.expectBackup {
assert.Empty(t, backupper.Calls)

10
pkg/controller/schedule_controller_test.go
View File

@ -138,7 +138,7 @@ func TestProcessSchedule(t *testing.T) {
)
if test.fakeClockTime != "" {
testTime, err = time.Parse("2006-01-02 15:04:05", test.fakeClockTime)
require.NoErrorf(t, err, "unable to parse test.fakeClockTime: %v", err)
require.NoError(t, err, "unable to parse test.fakeClockTime: %v", err)
}
c.clock = clock.NewFakeClock(testTime)
@ -161,7 +161,7 @@ func TestProcessSchedule(t *testing.T) {
key := test.scheduleKey
if key == "" && test.schedule != nil {
key, err = cache.MetaNamespaceKeyFunc(test.schedule)
require.NoErrorf(t, err, "error getting key from test.schedule: %v", err)
require.NoError(t, err, "error getting key from test.schedule: %v", err)
}
err = c.processSchedule(key)
@ -246,13 +246,13 @@ func TestGetNextRunTime(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
cronSchedule, err := cron.Parse(test.schedule.Spec.Schedule)
require.NoErrorf(t, err, "unable to parse test.schedule.Spec.Schedule: %v", err)
require.NoError(t, err, "unable to parse test.schedule.Spec.Schedule: %v", err)
testClock := clock.NewFakeClock(time.Now())
if test.lastRanOffset != "" {
offsetDuration, err := time.ParseDuration(test.lastRanOffset)
require.NoErrorf(t, err, "unable to parse test.lastRanOffset: %v", err)
require.NoError(t, err, "unable to parse test.lastRanOffset: %v", err)
test.schedule.Status.LastBackup = metav1.Time{Time: testClock.Now().Add(-offsetDuration)}
}
@ -360,7 +360,7 @@ func TestGetBackup(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
testTime, err := time.Parse("2006-01-02 15:04:05", test.testClockTime)
require.NoErrorf(t, err, "unable to parse test.testClockTime: %v", err)
require.NoError(t, err, "unable to parse test.testClockTime: %v", err)
backup := getBackup(test.schedule, clock.NewFakeClock(testTime).Now())