fix unit test; add no lint option to make structcheck happy

timflannagan · timflannagan · commit 083eb1af5a1d · 2021-12-22T13:57:42.000-05:00
diff --git a/pkg/controller/operators/olm/operator_test.go b/pkg/controller/operators/olm/operator_test.go
@@ -880,7 +880,7 @@ func TestTransitionCSV(t *testing.T) {
 
 	type csvState struct {
 		exists bool
-		phase  v1alpha1.ClusterServiceVersionPhase
+		phase  v1alpha1.ClusterServiceVersionPhase //nolint:structcheck
 		reason v1alpha1.ConditionReason
 	}
 	type operatorConfig struct {
diff --git a/pkg/controller/operators/openshift/clusteroperator_controller_test.go b/pkg/controller/operators/openshift/clusteroperator_controller_test.go
@@ -156,7 +156,7 @@ var _ = Describe("ClusterOperator controller", func() {
 			Type:               configv1.OperatorUpgradeable,
 			Status:             configv1.ConditionFalse,
 			Reason:             ErrorCheckingOperatorCompatibility,
-			Message:            "Encountered errors while checking compatibility with the next minor version of OpenShift: Desired release version missing from ClusterVersion",
+			Message:            "Encountered errors while checking compatibility with the next minor version of OpenShift: desired release version missing from ClusterVersion",
 			LastTransitionTime: fixedNow(),
 		}))
 

Original file line number	Diff line number	Diff line change
`@@ -880,7 +880,7 @@ func TestTransitionCSV(t *testing.T) {`
`880`	`880`
`881`	`881`	`type csvState struct {`
`882`	`882`	`exists bool`
`883`		`- phase v1alpha1.ClusterServiceVersionPhase`
	`883`	`+ phase v1alpha1.ClusterServiceVersionPhase //nolint:structcheck`
`884`	`884`	`reason v1alpha1.ConditionReason`
`885`	`885`	`}`
`886`	`886`	`type operatorConfig struct {`