mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-04-26 10:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix test conflicts from #1595 and #1598 (#1602)

Browse Source 
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
Nolan Brubaker
2019-06-24 17:34:56 -04:00
committed by Steve Kriss
parent 67512a3808
commit 08fe7be851
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/backup/backup_new_test.go
View File

@@ -1706,7 +1706,7 @@ func TestBackupWithInvalidHooks(t *testing.T) {
tests := []struct {
name string
backup *velerov1.Backup
apiResources []*apiResource
apiResources []*test.APIResource
want error
}{
{
@@ -1729,9 +1729,9 @@ func TestBackupWithInvalidHooks(t *testing.T) {
},
}).
Backup(),
apiResources: []*apiResource{
pods(
newPod("foo", "bar"),
apiResources: []*test.APIResource{
test.Pods(
test.NewPod("foo", "bar"),
),
},
want: errors.New("\"nonexistent-operator\" is not a valid pod selector operator"),
@@ -1747,7 +1747,7 @@ func TestBackupWithInvalidHooks(t *testing.T) {
)
for _, resource := range tc.apiResources {
h.addItems(t, resource.group, resource.version, resource.name, resource.shortName, resource.namespaced, resource.items...)
h.addItems(t, resource)
}
assert.EqualError(t, h.backupper.Backup(h.log, req, backupFile, nil, nil), tc.want.Error())
@@ -1771,7 +1771,7 @@ func TestBackupWithHooks(t *testing.T) {
tests := []struct {
name string
backup *velerov1.Backup
apiResources []*apiResource
apiResources []*test.APIResource
wantExecutePodCommandCalls []*expectedCall
wantBackedUp []string
}{
@@ -1793,10 +1793,10 @@ func TestBackupWithHooks(t *testing.T) {
},
}).
Backup(),
apiResources: []*apiResource{
pods(
newPod("ns-1", "pod-1"),
newPod("ns-2", "pod-2"),
apiResources: []*test.APIResource{
test.Pods(
test.NewPod("ns-1", "pod-1"),
test.NewPod("ns-2", "pod-2"),
),
},
wantExecutePodCommandCalls: []*expectedCall{
@@ -1842,10 +1842,10 @@ func TestBackupWithHooks(t *testing.T) {
},
}).
Backup(),
apiResources: []*apiResource{
pods(
newPod("ns-1", "pod-1"),
newPod("ns-2", "pod-2"),
apiResources: []*test.APIResource{
test.Pods(
test.NewPod("ns-1", "pod-1"),
test.NewPod("ns-2", "pod-2"),
),
},
wantExecutePodCommandCalls: []*expectedCall{
@@ -1898,9 +1898,9 @@ func TestBackupWithHooks(t *testing.T) {
},
}).
Backup(),
apiResources: []*apiResource{
pods(
newPod("ns-1", "pod-1"),
apiResources: []*test.APIResource{
test.Pods(
test.NewPod("ns-1", "pod-1"),
),
},
wantExecutePodCommandCalls: []*expectedCall{
@@ -1946,10 +1946,10 @@ func TestBackupWithHooks(t *testing.T) {
},
}).
Backup(),
apiResources: []*apiResource{
pods(
newPod("ns-1", "pod-1"),
newPod("ns-2", "pod-2"),
apiResources: []*test.APIResource{
test.Pods(
test.NewPod("ns-1", "pod-1"),
test.NewPod("ns-2", "pod-2"),
),
},
wantExecutePodCommandCalls: []*expectedCall{
@@ -2004,7 +2004,7 @@ func TestBackupWithHooks(t *testing.T) {
}
for _, resource := range tc.apiResources {
h.addItems(t, resource.group, resource.version, resource.name, resource.shortName, resource.namespaced, resource.items...)
h.addItems(t, resource)
}
require.NoError(t, h.backupper.Backup(h.log, req, backupFile, nil, nil))