Merge pull request #4551 from a-robinson/e2e

Migrate the certs.sh e2e test to ginkgo
This commit is contained in:
Zach Loafman
2015-02-19 17:34:04 -08:00
6 changed files with 79 additions and 56 deletions

View File

@@ -32,6 +32,12 @@ import (
type testResult bool
type GCEConfig struct {
ProjectID string
Zone string
MasterName string
}
func init() {
// Turn on verbose by default to get spec names
config.DefaultReporterConfig.Verbose = true
@@ -47,8 +53,8 @@ func (t *testResult) Fail() { *t = false }
// Run each Go end-to-end-test. This function assumes the
// creation of a test cluster.
func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed int64, times int, reportDir string, testList []string) {
testContext = testContextType{authConfig, certDir, host, repoRoot, provider}
func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, gceConfig *GCEConfig, orderseed int64, times int, reportDir string, testList []string) {
testContext = testContextType{authConfig, certDir, host, repoRoot, provider, *gceConfig}
util.ReallyCrash = true
util.InitLogs()
defer util.FlushLogs()