From eb29c6133b8ee8011883df28b4e6924ff03f1ba0 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Wed, 5 Oct 2016 15:13:59 -0500 Subject: [PATCH] Remove [Conformance] flag on e2es which we know are subject to change downstream. --- test/e2e/common/host_path.go | 2 +- test/e2e/example_cluster_dns.go | 2 +- test/e2e/networking.go | 2 +- test/e2e/proxy.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 558febec68e..a05af03e972 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -81,7 +81,7 @@ var _ = framework.KubeDescribe("HostPath", func() { }) }) - It("should support subPath [Conformance]", func() { + It("should support subPath", func() { volumePath := "/test-volume" subPath := "sub-path" fileName := "test-file" diff --git a/test/e2e/example_cluster_dns.go b/test/e2e/example_cluster_dns.go index 14c1348d648..36f8bcd1f44 100644 --- a/test/e2e/example_cluster_dns.go +++ b/test/e2e/example_cluster_dns.go @@ -50,7 +50,7 @@ var _ = framework.KubeDescribe("ClusterDns [Feature:Example]", func() { c = f.Client }) - It("should create pod that uses dns [Conformance]", func() { + It("should create pod that uses dns", func() { mkpath := func(file string) string { return filepath.Join(framework.TestContext.RepoRoot, "examples/cluster-dns", file) } diff --git a/test/e2e/networking.go b/test/e2e/networking.go index cb74b26cb84..4068765ae79 100644 --- a/test/e2e/networking.go +++ b/test/e2e/networking.go @@ -50,7 +50,7 @@ var _ = framework.KubeDescribe("Networking", func() { }) // First test because it has no dependencies on variables created later on. - It("should provide unchanging, static URL paths for kubernetes api services [Conformance]", func() { + It("should provide unchanging, static URL paths for kubernetes api services", func() { tests := []struct { path string }{ diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index 05af7e096e7..9cfa915433f 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -62,11 +62,11 @@ func proxyContext(version string) { // Port here has to be kept in sync with default kubelet port. It("should proxy logs on node with explicit kubelet port [Conformance]", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", ":10250/logs/") }) It("should proxy logs on node [Conformance]", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", "/logs/") }) - It("should proxy to cadvisor [Conformance]", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", ":4194/containers/") }) + It("should proxy to cadvisor", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", ":4194/containers/") }) It("should proxy logs on node with explicit kubelet port using proxy subresource [Conformance]", func() { nodeProxyTest(f, prefix+"/nodes/", ":10250/proxy/logs/") }) It("should proxy logs on node using proxy subresource [Conformance]", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") }) - It("should proxy to cadvisor using proxy subresource [Conformance]", func() { nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/") }) + It("should proxy to cadvisor using proxy subresource", func() { nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/") }) // using the porter image to serve content, access the content // (of multiple pods?) from multiple (endpoints/services?)