mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	test/e2e_node: Add [NodeConformance] to tests tagged [Conformance]
This has no effect yet until test configurations are updated.
This commit is contained in:
		@@ -46,7 +46,7 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
 | 
			
		||||
 | 
			
		||||
	Describe("container runtime conformance blackbox test", func() {
 | 
			
		||||
		Context("when starting a container that exits", func() {
 | 
			
		||||
			framework.ConformanceIt("it should run with the expected status", func() {
 | 
			
		||||
			framework.ConformanceIt("it should run with the expected status [NodeConformance]", func() {
 | 
			
		||||
				restartCountVolumeName := "restart-count"
 | 
			
		||||
				restartCountVolumePath := "/restart-count"
 | 
			
		||||
				testContainer := v1.Container{
 | 
			
		||||
@@ -127,7 +127,7 @@ while true; do sleep 1; done
 | 
			
		||||
					By("it should get the expected 'State'")
 | 
			
		||||
					Expect(GetContainerState(status.State)).To(Equal(testCase.State))
 | 
			
		||||
 | 
			
		||||
					By("it should be possible to delete [Conformance]")
 | 
			
		||||
					By("it should be possible to delete [Conformance][NodeConformance]")
 | 
			
		||||
					Expect(terminateContainer.Delete()).To(Succeed())
 | 
			
		||||
					Eventually(terminateContainer.Present, retryTimeout, pollInterval).Should(BeFalse())
 | 
			
		||||
				}
 | 
			
		||||
@@ -142,7 +142,7 @@ while true; do sleep 1; done
 | 
			
		||||
				message   gomegatypes.GomegaMatcher
 | 
			
		||||
			}{
 | 
			
		||||
				{
 | 
			
		||||
					name: "if TerminationMessagePath is set [Conformance]",
 | 
			
		||||
					name: "if TerminationMessagePath is set [Conformance][NodeConformance]",
 | 
			
		||||
					container: v1.Container{
 | 
			
		||||
						Image:   busyboxImage,
 | 
			
		||||
						Command: []string{"/bin/sh", "-c"},
 | 
			
		||||
@@ -157,7 +157,7 @@ while true; do sleep 1; done
 | 
			
		||||
				},
 | 
			
		||||
 | 
			
		||||
				{
 | 
			
		||||
					name: "if TerminationMessagePath is set as non-root user and at a non-default path [Conformance]",
 | 
			
		||||
					name: "if TerminationMessagePath is set as non-root user and at a non-default path [Conformance][NodeConformance]",
 | 
			
		||||
					container: v1.Container{
 | 
			
		||||
						Image:   busyboxImage,
 | 
			
		||||
						Command: []string{"/bin/sh", "-c"},
 | 
			
		||||
@@ -172,7 +172,7 @@ while true; do sleep 1; done
 | 
			
		||||
				},
 | 
			
		||||
 | 
			
		||||
				{
 | 
			
		||||
					name: "from log output if TerminationMessagePolicy FallbackToLogOnError is set [Conformance]",
 | 
			
		||||
					name: "from log output if TerminationMessagePolicy FallbackToLogOnError is set [Conformance][NodeConformance]",
 | 
			
		||||
					container: v1.Container{
 | 
			
		||||
						Image:   busyboxImage,
 | 
			
		||||
						Command: []string{"/bin/sh", "-c"},
 | 
			
		||||
@@ -198,7 +198,7 @@ while true; do sleep 1; done
 | 
			
		||||
				},
 | 
			
		||||
 | 
			
		||||
				{
 | 
			
		||||
					name: "from file when pod succeeds and TerminationMessagePolicy FallbackToLogOnError is set [Conformance]",
 | 
			
		||||
					name: "from file when pod succeeds and TerminationMessagePolicy FallbackToLogOnError is set [Conformance][NodeConformance]",
 | 
			
		||||
					container: v1.Container{
 | 
			
		||||
						Image:   busyboxImage,
 | 
			
		||||
						Command: []string{"/bin/sh", "-c"},
 | 
			
		||||
@@ -313,7 +313,7 @@ while true; do sleep 1; done
 | 
			
		||||
				},
 | 
			
		||||
			} {
 | 
			
		||||
				testCase := testCase
 | 
			
		||||
				It(testCase.description+" [Conformance]", func() {
 | 
			
		||||
				It(testCase.description+" [Conformance][NodeConformance]", func() {
 | 
			
		||||
					name := "image-pull-test"
 | 
			
		||||
					command := []string{"/bin/sh", "-c", "while true; do sleep 1; done"}
 | 
			
		||||
					container := ConformanceContainer{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user