github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34140 from timothysc/e2e-variant

Browse Source 
Automatic merge from submit-queue

remove [Conformance] flag on some e2es 

Downstream distributions that absorb the upstream tests would like to give their customers a standard mechanism to validate their clusters, post setup. As of today [Conformance] works for most things, but there are a known set of tests that vary due to opinionated differences around networking, security, etc... and providing a complete skip list can be cumbersome.  To address this, we've simply modified the flag on some tests to [Conformance:Variant].  All existing behavior should be maintained. 

Fixes: #34105
This commit is contained in:
Kubernetes Submit Queue 2016-10-11 16:01:42 -07:00 committed by GitHub
commit ff43515ff7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/common/host_path.go
View File

@ -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"

2
test/e2e/example_cluster_dns.go
View File

@ -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)
}

2
test/e2e/networking.go
View File

@ -49,7 +49,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
}{

4
test/e2e/proxy.go
View File

@ -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?)