From 8676fb3cdb9352dd22f3b94119b79a6c12d215a0 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 15 Jan 2020 20:37:23 +0000 Subject: [PATCH 1/3] Promote: Secret patching test --- test/conformance/testdata/conformance.txt | 1 + test/e2e/common/secrets.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index f08d4450b4e..fd7cb75752c 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -206,6 +206,7 @@ test/e2e/common/runtime.go: "should report termination message from file when p test/e2e/common/secrets.go: "should be consumable from pods in env vars" test/e2e/common/secrets.go: "should be consumable via the environment" test/e2e/common/secrets.go: "should fail to create secret due to empty secret key" +test/e2e/common/secrets.go: "should patch a secret" test/e2e/common/secrets_volume.go: "should be consumable from pods in volume" test/e2e/common/secrets_volume.go: "should be consumable from pods in volume with defaultMode set" test/e2e/common/secrets_volume.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set" diff --git a/test/e2e/common/secrets.go b/test/e2e/common/secrets.go index f28607cfc33..8def4a8d285 100644 --- a/test/e2e/common/secrets.go +++ b/test/e2e/common/secrets.go @@ -138,7 +138,16 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() { framework.ExpectError(err, "created secret %q with empty key in namespace %q", secret.Name, f.Namespace.Name) }) - ginkgo.It("should patch a secret", func() { + /* + Release : v1.18 + Testname: Secret patching + Description: A Secret is created. + Listing all Secrets MUST return an empty list. + Given the patching and fetching of the Secret, the fields MUST equal the new values. + The Secret is deleted by it's static Label. + Secrets are listed finally, the list MUST NOT include the originally created Secret. + */ + framework.ConformanceIt("should patch a secret", func() { ginkgo.By("creating a secret") secretTestName := "test-secret-" + string(uuid.NewUUID()) From 961c13ecba5a8beb2f024802d3b96a6fd1ef4765 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 15 Jan 2020 21:48:23 +0000 Subject: [PATCH 2/3] Fix: formatting --- test/e2e/common/secrets.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e/common/secrets.go b/test/e2e/common/secrets.go index 8def4a8d285..95018371e52 100644 --- a/test/e2e/common/secrets.go +++ b/test/e2e/common/secrets.go @@ -139,13 +139,13 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() { }) /* - Release : v1.18 - Testname: Secret patching - Description: A Secret is created. - Listing all Secrets MUST return an empty list. - Given the patching and fetching of the Secret, the fields MUST equal the new values. - The Secret is deleted by it's static Label. - Secrets are listed finally, the list MUST NOT include the originally created Secret. + Release : v1.18 + Testname: Secret patching + Description: A Secret is created. + Listing all Secrets MUST return an empty list. + Given the patching and fetching of the Secret, the fields MUST equal the new values. + The Secret is deleted by it's static Label. + Secrets are listed finally, the list MUST NOT include the originally created Secret. */ framework.ConformanceIt("should patch a secret", func() { ginkgo.By("creating a secret") From 7ac8f58ff60c5136e68ecef33a38bdbc6026b1c0 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 16 Jan 2020 00:56:06 +0000 Subject: [PATCH 3/3] Fix: formatting --- test/e2e/common/secrets.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/e2e/common/secrets.go b/test/e2e/common/secrets.go index 95018371e52..e232bed9cf1 100644 --- a/test/e2e/common/secrets.go +++ b/test/e2e/common/secrets.go @@ -139,13 +139,13 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() { }) /* - Release : v1.18 - Testname: Secret patching - Description: A Secret is created. - Listing all Secrets MUST return an empty list. - Given the patching and fetching of the Secret, the fields MUST equal the new values. - The Secret is deleted by it's static Label. - Secrets are listed finally, the list MUST NOT include the originally created Secret. + Release : v1.18 + Testname: Secret patching + Description: A Secret is created. + Listing all Secrets MUST return an empty list. + Given the patching and fetching of the Secret, the fields MUST equal the new values. + The Secret is deleted by it's static Label. + Secrets are listed finally, the list MUST NOT include the originally created Secret. */ framework.ConformanceIt("should patch a secret", func() { ginkgo.By("creating a secret")