From 295f43b1fa50f8a07c9dae33f8848e2938a8c738 Mon Sep 17 00:00:00 2001 From: Mayank Gaikwad <8110509+mgdevstack@users.noreply.github.com> Date: Thu, 4 Apr 2019 07:09:17 +0530 Subject: [PATCH] Promote container runtime e2e verifying non-default termination message path --- test/conformance/testdata/conformance.txt | 1 + test/e2e/common/runtime.go | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 8ce92e5ef19..c0116c7bac7 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -147,6 +147,7 @@ test/e2e/common/projected_secret.go: "should be consumable from pods in volume w test/e2e/common/projected_secret.go: "should be consumable in multiple volumes in a pod" test/e2e/common/projected_secret.go: "optional updates should be reflected in volume" test/e2e/common/runtime.go: "should run with the expected status" +test/e2e/common/runtime.go: "should report termination message if TerminationMessagePath is set as non-root user and at a non-default path" 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_volume.go: "should be consumable from pods in volume" diff --git a/test/e2e/common/runtime.go b/test/e2e/common/runtime.go index d27d2c12e99..831e913ca03 100644 --- a/test/e2e/common/runtime.go +++ b/test/e2e/common/runtime.go @@ -174,8 +174,13 @@ while true; do sleep 1; done matchTerminationMessage(container, v1.PodSucceeded, Equal("DONE")) }) - It("should report termination message [LinuxOnly] if TerminationMessagePath is set as non-root user and at a non-default path [NodeConformance]", func() { - // Cannot mount files in Windows Containers. + /* + Release: v1.15 + Name: Container Runtime, TerminationMessagePath, non-root user and non-default path + Description: Create a pod with a container to run it as a non-root user with a custom TerminationMessagePath set. Pod redirects the output to the provided path successfully. When the container is terminated, the termination message MUST match the expected output logged in the provided custom path. + [LinuxOnly]: Tagged LinuxOnly due to use of 'uid' and unable to mount files in Windows Containers. + */ + framework.ConformanceIt("should report termination message [LinuxOnly] if TerminationMessagePath is set as non-root user and at a non-default path [NodeConformance]", func() { container := v1.Container{ Image: framework.BusyBoxImage, Command: []string{"/bin/sh", "-c"},