mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2025-12-15 20:37:39 +00:00
e2e: use framework labels
This changes the text registration so that tags for which the framework has a dedicated API (features, feature gates, slow, serial, etc.) those APIs are used. Arbitrary, custom tags are still left in place for now.
This commit is contained in:
@@ -38,7 +38,7 @@ var _ = SIGDescribe("Containers", func() {
|
||||
Testname: Containers, without command and arguments
|
||||
Description: Default command and arguments from the container image entrypoint MUST be used when Pod does not specify the container command
|
||||
*/
|
||||
framework.ConformanceIt("should use the image defaults if command and args are blank [NodeConformance]", func(ctx context.Context) {
|
||||
framework.ConformanceIt("should use the image defaults if command and args are blank", f.WithNodeConformance(), func(ctx context.Context) {
|
||||
pod := entrypointTestPod(f.Namespace.Name)
|
||||
pod.Spec.Containers[0].Args = nil
|
||||
pod = e2epod.NewPodClient(f).Create(ctx, pod)
|
||||
@@ -58,7 +58,7 @@ var _ = SIGDescribe("Containers", func() {
|
||||
Testname: Containers, with arguments
|
||||
Description: Default command and from the container image entrypoint MUST be used when Pod does not specify the container command but the arguments from Pod spec MUST override when specified.
|
||||
*/
|
||||
framework.ConformanceIt("should be able to override the image's default arguments (container cmd) [NodeConformance]", func(ctx context.Context) {
|
||||
framework.ConformanceIt("should be able to override the image's default arguments (container cmd)", f.WithNodeConformance(), func(ctx context.Context) {
|
||||
pod := entrypointTestPod(f.Namespace.Name, "entrypoint-tester", "override", "arguments")
|
||||
e2epodoutput.TestContainerOutput(ctx, f, "override arguments", pod, 0, []string{
|
||||
"[/agnhost entrypoint-tester override arguments]",
|
||||
@@ -72,7 +72,7 @@ var _ = SIGDescribe("Containers", func() {
|
||||
Testname: Containers, with command
|
||||
Description: Default command from the container image entrypoint MUST NOT be used when Pod specifies the container command. Command from Pod spec MUST override the command in the image.
|
||||
*/
|
||||
framework.ConformanceIt("should be able to override the image's default command (container entrypoint) [NodeConformance]", func(ctx context.Context) {
|
||||
framework.ConformanceIt("should be able to override the image's default command (container entrypoint)", f.WithNodeConformance(), func(ctx context.Context) {
|
||||
pod := entrypointTestPod(f.Namespace.Name, "entrypoint-tester")
|
||||
pod.Spec.Containers[0].Command = []string{"/agnhost-2"}
|
||||
|
||||
@@ -86,7 +86,7 @@ var _ = SIGDescribe("Containers", func() {
|
||||
Testname: Containers, with command and arguments
|
||||
Description: Default command and arguments from the container image entrypoint MUST NOT be used when Pod specifies the container command and arguments. Command and arguments from Pod spec MUST override the command and arguments in the image.
|
||||
*/
|
||||
framework.ConformanceIt("should be able to override the image's default command and arguments [NodeConformance]", func(ctx context.Context) {
|
||||
framework.ConformanceIt("should be able to override the image's default command and arguments", f.WithNodeConformance(), func(ctx context.Context) {
|
||||
pod := entrypointTestPod(f.Namespace.Name, "entrypoint-tester", "override", "arguments")
|
||||
pod.Spec.Containers[0].Command = []string{"/agnhost-2"}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user