Check sync error in unit test properly

Tests must fail when syncContent() returns success and error was expected.

Author: jsafrane

pkg/sidecar-controller/content_create_test.go

@@ -50,6 +50,7 @@ func TestSyncContent(t *testing.T) {
 				},
 			},
 			expectedListCalls: []listCall{{"sid1-1", map[string]string{}, true, time.Now(), 1, nil}},
+			expectSuccess:     true,
 			errors:            noerrors,
 			test:              testSyncContent,
 		},
@@ -78,6 +79,7 @@ func TestSyncContent(t *testing.T) {
 				},
 			},
 			expectedListCalls: []listCall{{"sid1-2", map[string]string{}, true, time.Now(), 1, nil}},
+			expectSuccess:     true,
 			errors:            noerrors,
 			test:              testSyncContent,
 		},
@@ -140,6 +142,7 @@ func TestSyncContent(t *testing.T) {
 					size:         defaultSize,
 				},
 			},
+			expectSuccess:  true,
 			initialSecrets: []*v1.Secret{secret()},
 			expectedEvents: noevents,
 			errors:         noerrors,

pkg/sidecar-controller/framework_test.go

@@ -808,6 +808,9 @@ func runSyncContentTests(t *testing.T, tests []controllerTest, snapshotClasses [
 		if test.expectSuccess && err != nil {
 			t.Errorf("Test %q failed: %v", test.name, err)
 		}
+		if !test.expectSuccess && err == nil {
+			t.Errorf("Test %q failed: expected error, got nil", test.name)
+		}
 
 		// Wait for the target state
 		err = reactor.waitTest(test)

pkg/sidecar-controller/snapshot_delete_test.go

@@ -266,6 +266,7 @@ func TestDeleteSync(t *testing.T) {
 			expectedContents:  newContentArrayWithReadyToUse("content1-7", "", "snap1-7", "sid1-7", validSecretClass, "sid1-7", "", deletePolicy, nil, &defaultSize, &True, true),
 			expectedEvents:    noevents,
 			expectedListCalls: []listCall{{"sid1-7", map[string]string{}, true, time.Now(), 1000, nil}},
+			expectSuccess:     true,
 			initialSecrets:    []*v1.Secret{secret()},
 			errors:            noerrors,
 			test:              testSyncContent,
@@ -276,6 +277,7 @@ func TestDeleteSync(t *testing.T) {
 			expectedContents:  newContentArrayWithReadyToUse("content1-8", "sid1-8", "none-existed-snapshot", "sid1-8", validSecretClass, "sid1-8", "", retainPolicy, nil, &defaultSize, &True, true),
 			expectedEvents:    noevents,
 			expectedListCalls: []listCall{{"sid1-8", map[string]string{}, true, time.Now(), 0, nil}},
+			expectSuccess:     true,
 			errors:            noerrors,
 			test:              testSyncContent,
 		},
@@ -285,6 +287,7 @@ func TestDeleteSync(t *testing.T) {
 			expectedContents:    newContentArrayWithDeletionTimestamp("content1-9", "sid1-9", "snap1-9", "", emptySecretClass, "", "snap1-9-volumehandle", deletePolicy, nil, &defaultSize, false, &nonFractionalTime),
 			expectedEvents:      noevents,
 			expectedListCalls:   []listCall{{"sid1-9", map[string]string{}, true, time.Now(), 0, nil}},
+			expectSuccess:       true,
 			errors:              noerrors,
 			initialSecrets:      []*v1.Secret{}, // secret does not exist
 			expectedDeleteCalls: []deleteCall{{"sid1-9", nil, nil}},
@@ -296,6 +299,7 @@ func TestDeleteSync(t *testing.T) {
 			expectedContents:  newContentArrayWithDeletionTimestamp("content1-10", "sid1-10", "snap1-10", "sid1-10", emptySecretClass, "", "snap1-10-volumehandle", retainPolicy, nil, &defaultSize, false, &nonFractionalTime),
 			expectedEvents:    noevents,
 			expectedListCalls: []listCall{{"sid1-10", map[string]string{}, true, time.Now(), 0, nil}},
+			expectSuccess:     true,
 			errors:            noerrors,
 			initialSecrets:    []*v1.Secret{},
 			test:              testSyncContent,
@@ -305,6 +309,7 @@ func TestDeleteSync(t *testing.T) {
 			initialContents:     newContentArrayWithDeletionTimestamp("content1-11", "sid1-11", "snap1-11", "sid1-11", emptySecretClass, "", "snap1-11-volumehandle", deletePolicy, nil, &defaultSize, true, &nonFractionalTime),
 			expectedContents:    newContentArrayWithDeletionTimestamp("content1-11", "sid1-11", "snap1-11", "", emptySecretClass, "", "snap1-11-volumehandle", deletePolicy, nil, nil, false, &nonFractionalTime),
 			expectedEvents:      noevents,
+			expectSuccess:       true,
 			errors:              noerrors,
 			expectedDeleteCalls: []deleteCall{{"sid1-11", nil, nil}},
 			test:                testSyncContent,
@@ -315,6 +320,7 @@ func TestDeleteSync(t *testing.T) {
 			expectedContents:  newContentArrayWithDeletionTimestamp("content1-12", "sid1-12", "snap1-12", "sid1-12", emptySecretClass, "sid1-12", "", retainPolicy, nil, &defaultSize, false, &nonFractionalTime),
 			expectedEvents:    noevents,
 			expectedListCalls: []listCall{{"sid1-12", map[string]string{}, true, time.Now(), 0, nil}},
+			expectSuccess:     true,
 			errors:            noerrors,
 			initialSecrets:    []*v1.Secret{},
 			test:              testSyncContent,
@@ -324,6 +330,7 @@ func TestDeleteSync(t *testing.T) {
 			initialContents:     newContentArrayWithDeletionTimestamp("content1-13", "sid1-13", "snap1-13", "sid1-13", emptySecretClass, "sid1-13", "", deletePolicy, nil, &defaultSize, true, &nonFractionalTime),
 			expectedContents:    newContentArrayWithDeletionTimestamp("content1-13", "sid1-13", "snap1-13", "", emptySecretClass, "sid1-13", "", deletePolicy, nil, nil, false, &nonFractionalTime),
 			expectedEvents:      noevents,
+			expectSuccess:       true,
 			errors:              noerrors,
 			expectedDeleteCalls: []deleteCall{{"sid1-13", nil, nil}},
 			test:                testSyncContent,
@@ -333,6 +340,7 @@ func TestDeleteSync(t *testing.T) {
 			initialContents:     newContentArrayWithDeletionTimestamp("content1-14", "sid1-14", "snap1-14", "sid1-14", "", "sid1-14", "", deletePolicy, nil, &defaultSize, true, &nonFractionalTime),
 			expectedContents:    newContentArrayWithDeletionTimestamp("content1-14", "sid1-14", "snap1-14", "", "", "sid1-14", "", deletePolicy, nil, nil, false, &nonFractionalTime),
 			expectedEvents:      noevents,
+			expectSuccess:       true,
 			errors:              noerrors,
 			expectedDeleteCalls: []deleteCall{{"sid1-14", nil, nil}},
 			test:                testSyncContent,
@@ -341,6 +349,7 @@ func TestDeleteSync(t *testing.T) {
 			name:                "1-15 - (dynamic)deletion of content with no snapshotclass should succeed",
 			initialContents:     newContentArrayWithDeletionTimestamp("content1-15", "sid1-15", "snap1-15", "sid1-15", "", "", "snap1-15-volumehandle", deletePolicy, nil, &defaultSize, true, &nonFractionalTime),
 			expectedContents:    newContentArrayWithDeletionTimestamp("content1-15", "sid1-15", "snap1-15", "", "", "", "snap1-15-volumehandle", deletePolicy, nil, &defaultSize, false, &nonFractionalTime),
+			expectSuccess:       true,
 			errors:              noerrors,
 			expectedDeleteCalls: []deleteCall{{"sid1-15", nil, nil}},
 			test:                testSyncContent,