diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 047d878a7fc..9fca7980c1d 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -38,7 +38,7 @@ that the pre-stop is executed. release: v1.9 file: test/e2e/common/lifecycle_hook.go -- testname: "" +- testname: Container Runtime, TerminationMessage, from log output of succeeding container codename: '[k8s.io] Container Runtime blackbox test on terminated container should report termination message [LinuxOnly] as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance] [Conformance]' @@ -48,7 +48,7 @@ mount files in Windows Containers.' release: v1.15 file: test/e2e/common/runtime.go -- testname: "" +- testname: Container Runtime, TerminationMessage, from file of succeeding container codename: '[k8s.io] Container Runtime blackbox test on terminated container should report termination message [LinuxOnly] from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance] [Conformance]' @@ -58,7 +58,8 @@ Cannot mount files in Windows Containers.' release: v1.15 file: test/e2e/common/runtime.go -- testname: "" +- testname: Container Runtime, TerminationMessage, from container's log output of + failing container codename: '[k8s.io] Container Runtime blackbox test on terminated container should report termination message [LinuxOnly] from log output if TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance] [Conformance]' @@ -68,7 +69,8 @@ Cannot mount files in Windows Containers.' release: v1.15 file: test/e2e/common/runtime.go -- testname: "" +- testname: Container Runtime, TerminationMessagePath, non-root user and non-default + path codename: '[k8s.io] Container Runtime blackbox test on terminated container should report termination message [LinuxOnly] if TerminationMessagePath is set as non-root user and at a non-default path [NodeConformance] [Conformance]' diff --git a/test/conformance/walk.go b/test/conformance/walk.go index 455f35fb9ff..34d232eacf0 100644 --- a/test/conformance/walk.go +++ b/test/conformance/walk.go @@ -329,7 +329,7 @@ func commentToConformanceData(comment string) *conformanceData { descLines = append(descLines, line) } } - if cd.Release == "" && cd.TestName == "" { + if cd.TestName == "" { return nil } diff --git a/test/conformance/walk_test.go b/test/conformance/walk_test.go index 066a83cd9cb..153f01183cb 100644 --- a/test/conformance/walk_test.go +++ b/test/conformance/walk_test.go @@ -147,9 +147,8 @@ func TestCommentToConformanceData(t *testing.T) { desc: "No Release or Testname leads to nil", input: "Description: foo", }, { - desc: "Release but no Testname does not result in nil", - input: "Release: v1.1\nDescription: foo", - expected: &conformanceData{Release: "v1.1", Description: "foo"}, + desc: "Release but no Testname should result in nil", + input: "Release: v1.1\nDescription: foo", }, { desc: "Testname but no Release does not result in nil", input: "Testname: mytest\nDescription: foo", diff --git a/test/e2e/common/runtime.go b/test/e2e/common/runtime.go index 677c8f6465a..d205be4d18f 100644 --- a/test/e2e/common/runtime.go +++ b/test/e2e/common/runtime.go @@ -189,7 +189,7 @@ while true; do sleep 1; done /* Release: v1.15 - Name: Container Runtime, TerminationMessagePath, non-root user and non-default path + Testname: 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. */ @@ -213,7 +213,7 @@ while true; do sleep 1; done /* Release: v1.15 - Name: Container Runtime, TerminationMessage, from container's log output of failing container + Testname: Container Runtime, TerminationMessage, from container's log output of failing container Description: Create a pod with an container. Container's output is recorded in log and container exits with an error. When container is terminated, termination message MUST match the expected output recorded from container's log. [LinuxOnly]: Cannot mount files in Windows Containers. */ @@ -230,7 +230,7 @@ while true; do sleep 1; done /* Release: v1.15 - Name: Container Runtime, TerminationMessage, from log output of succeeding container + Testname: Container Runtime, TerminationMessage, from log output of succeeding container Description: Create a pod with an container. Container's output is recorded in log and container exits successfully without an error. When container is terminated, terminationMessage MUST have no content as container succeed. [LinuxOnly]: Cannot mount files in Windows Containers. */ @@ -247,7 +247,7 @@ while true; do sleep 1; done /* Release: v1.15 - Name: Container Runtime, TerminationMessage, from file of succeeding container + Testname: Container Runtime, TerminationMessage, from file of succeeding container Description: Create a pod with an container. Container's output is recorded in a file and the container exits successfully without an error. When container is terminated, terminationMessage MUST match with the content from file. [LinuxOnly]: Cannot mount files in Windows Containers. */