github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Promote aggregator e2e test to conformance

Browse Source
This commit is contained in:
jennybuckley
2019-02-15 11:04:38 -08:00
committed by Jennifer Buckley
parent 07428f7e5d
commit 8101b86ac4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/conformance/testdata/conformance.txt vendored
View File

@@ -1,3 +1,4 @@
test/e2e/apimachinery/aggregator.go: "Should be able to support the 1.10 Sample API Server using the current Aggregator"
test/e2e/apimachinery/custom_resource_definition.go: "creating/deleting custom resource definition objects works" test/e2e/apimachinery/custom_resource_definition.go: "creating/deleting custom resource definition objects works"
test/e2e/apimachinery/garbage_collector.go: "should delete pods created by rc when not orphaning" test/e2e/apimachinery/garbage_collector.go: "should delete pods created by rc when not orphaning"
test/e2e/apimachinery/garbage_collector.go: "should orphan pods created by rc if delete options say so" test/e2e/apimachinery/garbage_collector.go: "should orphan pods created by rc if delete options say so"

11
test/e2e/apimachinery/aggregator.go
View File

@@ -72,11 +72,12 @@ var _ = SIGDescribe("Aggregator", func() {
aggrclient = f.AggregatorClient aggrclient = f.AggregatorClient
}) })
It("Should be able to support the 1.10 Sample API Server using the current Aggregator", func() { /*
// Make sure the relevant provider supports Aggregator Testname: aggregator-supports-the-sample-apiserver
framework.SkipUnlessServerVersionGTE(serverAggregatorVersion, f.ClientSet.Discovery()) Description: Ensure that the sample-apiserver code from 1.10 and compiled against 1.10
framework.SkipUnlessProviderIs("gce", "gke") will work on the current Aggregator/API-Server.
*/
framework.ConformanceIt("Should be able to support the 1.10 Sample API Server using the current Aggregator", func() {
// Testing a 1.10 version of the sample-apiserver // Testing a 1.10 version of the sample-apiserver
TestSampleAPIServer(f, imageutils.GetE2EImage(imageutils.APIServer)) TestSampleAPIServer(f, imageutils.GetE2EImage(imageutils.APIServer))
}) })