Merge pull request #52466 from charrywanganthony/audit-2

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Update the test under audit/policy Small change to cope with [previous review](https://github.com/kubernetes/kubernetes/pull/51782#pullrequestreview-61526174) @crassirostris

Merge pull request #52466 from charrywanganthony/audit-2
2d7192c5 · Kubernetes Submit Queue · GitHub · 9a7818a2 · ea1694ea · 2d7192c5
Commit 2d7192c5 authored Sep 19, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

reader_test.go staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go +4 -5

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go
@@ -91,7 +91,7 @@ var expectedPolicy = &audit.Policy{
 }
 func TestParserV1alpha1(t *testing.T) {
-	f, err := writePolicy(policyDefV1alpha1, t)
+	f, err := writePolicy(t, policyDefV1alpha1)
 	require.NoError(t, err)
 	defer os.Remove(f)
@@ -105,7 +105,7 @@ func TestParserV1alpha1(t *testing.T) {
 }
 func TestParserV1beta1(t *testing.T) {
-	f, err := writePolicy(policyDefV1beta1, t)
+	f, err := writePolicy(t, policyDefV1beta1)
 	require.NoError(t, err)
 	defer os.Remove(f)
@@ -119,7 +119,6 @@ func TestParserV1beta1(t *testing.T) {
 }
 func TestPolicyCntCheck(t *testing.T) {
-	//a set of testCases
 	var testCases = []struct {
 		caseName, policy string
 	}{
@@ -132,7 +131,7 @@ kind: Policy`,
 	}
 	for _, tc := range testCases {
-		f, err := writePolicy(tc.policy, t)
+		f, err := writePolicy(t, tc.policy)
 		require.NoError(t, err)
 		defer os.Remove(f)
@@ -141,7 +140,7 @@ kind: Policy`,
 	}
 }
-func writePolicy(policy string, t *testing.T) (string, error) {
+func writePolicy(t *testing.T, policy string) (string, error) {
 	f, err := ioutil.TempFile("", "policy.yaml")
 	require.NoError(t, err)