Skip to content

Commit ce28320

Browse files
committed
pkg/repo: Simplify proposal validation test
Signed-off-by: Stephen Augustus <[email protected]>
1 parent 4ac14c6 commit ce28320

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

pkg/repo/repo_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package repo_test
1818

1919
import (
20-
"fmt"
2120
"io/ioutil"
2221
"testing"
2322

@@ -30,19 +29,19 @@ import (
3029

3130
func TestProposalValidate(t *testing.T) {
3231
testcases := []struct {
33-
name string
34-
file string
35-
err error
32+
name string
33+
file string
34+
expectError bool
3635
}{
3736
{
38-
name: "valid KEP passes validate",
39-
file: "testdata/valid-kep.yaml",
40-
err: nil,
37+
name: "valid KEP passes validate",
38+
file: "testdata/valid-kep.yaml",
39+
expectError: false,
4140
},
4241
{
43-
name: "invalid KEP fails validate for owning-sig",
44-
file: "testdata/invalid-kep.yaml",
45-
err: fmt.Errorf(`kep is invalid: error validating KEP metadata: "owning-sig" must be one of (committee-code-of-conduct,committee-product-security,committee-steering,sig-api-machinery,sig-apps,sig-architecture,sig-auth,sig-autoscaling,sig-cli,sig-cloud-provider,sig-cluster-lifecycle,sig-contributor-experience,sig-docs,sig-instrumentation,sig-multicluster,sig-network,sig-node,sig-release,sig-scalability,sig-scheduling,sig-security,sig-service-catalog,sig-storage,sig-testing,sig-ui,sig-usability,sig-windows,ug-big-data,ug-vmware-users,wg-api-expression,wg-component-standard,wg-data-protection,wg-iot-edge,wg-k8s-infra,wg-lts,wg-multitenancy,wg-naming,wg-policy,wg-security-audit) but it is a string: sig-awesome`),
42+
name: "invalid KEP fails validate for owning-sig",
43+
file: "testdata/invalid-kep.yaml",
44+
expectError: true,
4645
},
4746
}
4847

@@ -56,11 +55,11 @@ func TestProposalValidate(t *testing.T) {
5655
require.NoError(t, err)
5756

5857
err = p.Validate()
59-
if tc.err == nil {
60-
require.NoError(t, err)
61-
} else {
62-
require.EqualError(t, err, tc.err.Error())
58+
if tc.expectError {
59+
require.Error(t, err)
6360
}
61+
62+
require.NoError(t, err)
6463
})
6564
}
6665
}

0 commit comments

Comments
 (0)