github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

tests: Enable some [LinuxOnly] tests for Windows Containerd

Browse Source 
Windows Containerd has more features than Windows Docker. One of them is single file
mappings, allowing us to also map individual files into containers, not just folders.

This will set the tag [Excluded:WindowsDocker] for those tests instead of [LinuxOnly].

Co-authored-by: Mark Rossetti <marosset@microsoft.com>
This commit is contained in:
Claudiu Belu
2020-12-01 06:58:28 -08:00
parent 23d4b3b4f0
commit 91c095a11f
3 changed files with 73 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/common/node/runtime.go
View File

@@ -168,9 +168,9 @@ while true; do sleep 1; done
gomega.Expect(c.Delete()).To(gomega.Succeed())
}
ginkgo.It("should report termination message [LinuxOnly] if TerminationMessagePath is set [NodeConformance]", func() {
// Cannot mount files in Windows Containers.
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default
ginkgo.It("should report termination message if TerminationMessagePath is set [Excluded:WindowsDocker] [NodeConformance]", func() {
// Cannot mount files in Windows Containers created by Docker.
// TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only
// container runtime on Windows.
container := v1.Container{
Image: framework.BusyBoxImage,
@@ -215,9 +215,9 @@ while true; do sleep 1; done
Release: v1.15
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.
[Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/
framework.ConformanceIt("should report termination message [LinuxOnly] from log output if TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() {
framework.ConformanceIt("should report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{
Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"},
@@ -232,9 +232,9 @@ while true; do sleep 1; done
Release: v1.15
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.
[Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/
framework.ConformanceIt("should report termination message [LinuxOnly] as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() {
framework.ConformanceIt("should report termination message as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{
Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"},
@@ -249,9 +249,9 @@ while true; do sleep 1; done
Release: v1.15
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.
[Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/
framework.ConformanceIt("should report termination message [LinuxOnly] from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() {
framework.ConformanceIt("should report termination message from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{
Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"},