Skip to content

Commit 90cd496

Browse files
committed
Include testname
1 parent 34ad7d1 commit 90cd496

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

test/conformance/testdata/conformance.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
that the pre-stop is executed.
3939
release: v1.9
4040
file: test/e2e/common/lifecycle_hook.go
41-
- testname: ""
41+
- testname: Container Runtime, TerminationMessage, from log output of succeeding container
4242
codename: '[k8s.io] Container Runtime blackbox test on terminated container should
4343
report termination message [LinuxOnly] as empty when pod succeeds and TerminationMessagePolicy
4444
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
@@ -48,7 +48,7 @@
4848
mount files in Windows Containers.'
4949
release: v1.15
5050
file: test/e2e/common/runtime.go
51-
- testname: ""
51+
- testname: Container Runtime, TerminationMessage, from file of succeeding container
5252
codename: '[k8s.io] Container Runtime blackbox test on terminated container should
5353
report termination message [LinuxOnly] from file when pod succeeds and TerminationMessagePolicy
5454
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
@@ -58,7 +58,8 @@
5858
Cannot mount files in Windows Containers.'
5959
release: v1.15
6060
file: test/e2e/common/runtime.go
61-
- testname: ""
61+
- testname: Container Runtime, TerminationMessage, from container's log output of
62+
failing container
6263
codename: '[k8s.io] Container Runtime blackbox test on terminated container should
6364
report termination message [LinuxOnly] from log output if TerminationMessagePolicy
6465
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
@@ -68,7 +69,8 @@
6869
Cannot mount files in Windows Containers.'
6970
release: v1.15
7071
file: test/e2e/common/runtime.go
71-
- testname: ""
72+
- testname: Container Runtime, TerminationMessagePath, non-root user and non-default
73+
path
7274
codename: '[k8s.io] Container Runtime blackbox test on terminated container should
7375
report termination message [LinuxOnly] if TerminationMessagePath is set as non-root
7476
user and at a non-default path [NodeConformance] [Conformance]'

test/e2e/common/runtime.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ while true; do sleep 1; done
189189

190190
/*
191191
Release: v1.15
192-
Name: Container Runtime, TerminationMessagePath, non-root user and non-default path
192+
Testname: Container Runtime, TerminationMessagePath, non-root user and non-default path
193193
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.
194194
[LinuxOnly]: Tagged LinuxOnly due to use of 'uid' and unable to mount files in Windows Containers.
195195
*/
@@ -213,7 +213,7 @@ while true; do sleep 1; done
213213

214214
/*
215215
Release: v1.15
216-
Name: Container Runtime, TerminationMessage, from container's log output of failing container
216+
Testname: Container Runtime, TerminationMessage, from container's log output of failing container
217217
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.
218218
[LinuxOnly]: Cannot mount files in Windows Containers.
219219
*/
@@ -230,7 +230,7 @@ while true; do sleep 1; done
230230

231231
/*
232232
Release: v1.15
233-
Name: Container Runtime, TerminationMessage, from log output of succeeding container
233+
Testname: Container Runtime, TerminationMessage, from log output of succeeding container
234234
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.
235235
[LinuxOnly]: Cannot mount files in Windows Containers.
236236
*/
@@ -247,7 +247,7 @@ while true; do sleep 1; done
247247

248248
/*
249249
Release: v1.15
250-
Name: Container Runtime, TerminationMessage, from file of succeeding container
250+
Testname: Container Runtime, TerminationMessage, from file of succeeding container
251251
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.
252252
[LinuxOnly]: Cannot mount files in Windows Containers.
253253
*/

0 commit comments

Comments
 (0)