github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 05:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Revive conformance test.

Browse Source 
Use KUBE_CONFIG_FILE instead of AUTH_CONFIG (and CERT_DIR).

Pass GINKGO_TEST_ARGS for a subset of e2e tests which
@erictune has deemed initially sufficient for conformance.

Allow GINKGO_TEST_ARGS to pass through hack/ginkgo-e2e.sh.

Set NUM_MINIONS (need better way to handle this).

Remove use of "KUBERNETES_CONFORMANCE_TEST" variable
and use of KUBERNETES_PROVIDER="conformance_test" convention,
both of which have no apparent purpose.

Allow unset testContext.provider in test/e2e/e2e_test.go
Allow testContext.Provider to be unset in providerIs().
This commit is contained in:
Eric Tune
2015-06-15 14:00:59 -07:00
parent ebeb104493
commit c5efb12a62
4 changed files with 105 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/e2e_test.go
View File

@@ -103,9 +103,8 @@ func TestE2E(t *testing.T) {
util.InitLogs()
defer util.FlushLogs()
// TODO: possibly clean up or refactor this functionality.
if testContext.Provider == "" {
glog.Fatal("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.")
glog.Info("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.")
}
if testContext.Provider == "aws" {

3
test/e2e/util.go
View File

@@ -183,9 +183,6 @@ func Failf(format string, a ...interface{}) {
}
func providerIs(providers ...string) bool {
if testContext.Provider == "" {
Fail("testContext.Provider is not defined")
}
for _, provider := range providers {
if strings.ToLower(provider) == strings.ToLower(testContext.Provider) {
return true