extract a helper for comparing slices of Actions reliably

Signed-off-by: Steve Kriss <steve@heptio.com>
This commit is contained in:
Steve Kriss
2018-04-06 15:38:01 -07:00
parent 25d46a709b
commit 5bb47d2b7a
2 changed files with 63 additions and 29 deletions

View File

@@ -19,7 +19,6 @@ package controller
import (
"context"
"fmt"
"reflect"
"testing"
"time"
@@ -431,32 +430,7 @@ func TestBackupDeletionControllerProcessRequest(t *testing.T) {
),
}
assert.Len(t, td.client.Actions(), len(expectedActions))
for _, e := range expectedActions {
found := false
for _, a := range td.client.Actions() {
if reflect.DeepEqual(e, a) {
found = true
break
}
}
if !found {
t.Errorf("missing expected action %#v", e)
}
}
for _, a := range td.client.Actions() {
found := false
for _, e := range expectedActions {
if reflect.DeepEqual(e, a) {
found = true
break
}
}
if !found {
t.Errorf("unexpected action %#v", a)
}
}
arktest.CompareActions(t, expectedActions, td.client.Actions())
// Make sure snapshot was deleted
assert.Equal(t, 0, td.snapshotService.SnapshotsTaken.Len())
@@ -604,8 +578,7 @@ func TestBackupDeletionControllerDeleteExpiredRequests(t *testing.T) {
expectedActions = append(expectedActions, core.NewDeleteAction(v1.SchemeGroupVersion.WithResource("deletebackuprequests"), "ns", name))
}
assert.Equal(t, expectedActions, client.Actions())
arktest.CompareActions(t, expectedActions, client.Actions())
})
}
}