github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25853 from spxtr/sync-e2e

Browse Source 
Run setupProviderConfig in BeforeSuite.
This commit is contained in:
Alex Robinson 2016-05-27 11:28:43 -07:00
commit b089c18c49
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/e2e.go
View File

@ -103,6 +103,10 @@ func setupProviderConfig() error {
var _ = ginkgo.SynchronizedBeforeSuite(func() []byte { var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
// Run only on Ginkgo node 1 // Run only on Ginkgo node 1
if err := setupProviderConfig(); err != nil {
framework.Failf("Failed to setup provider config: %v", err)
}
// Delete any namespaces except default and kube-system. This ensures no // Delete any namespaces except default and kube-system. This ensures no
// lingering resources are left over from a previous test run. // lingering resources are left over from a previous test run.
if framework.TestContext.CleanStart { if framework.TestContext.CleanStart {
@ -149,6 +153,11 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
}, func(data []byte) { }, func(data []byte) {
// Run on all Ginkgo nodes // Run on all Ginkgo nodes
if cloudConfig.Provider == nil {
if err := setupProviderConfig(); err != nil {
framework.Failf("Failed to setup provider config: %v", err)
}
}
}) })
type CleanupActionHandle *int type CleanupActionHandle *int
@ -216,12 +225,6 @@ func RunE2ETests(t *testing.T) {
util.InitLogs() util.InitLogs()
defer util.FlushLogs() defer util.FlushLogs()
// We must call setupProviderConfig first since SynchronizedBeforeSuite needs
// cloudConfig to be set up already.
if err := setupProviderConfig(); err != nil {
glog.Fatalf(err.Error())
}
gomega.RegisterFailHandler(ginkgo.Fail) gomega.RegisterFailHandler(ginkgo.Fail)
// Disable skipped tests unless they are explicitly requested. // Disable skipped tests unless they are explicitly requested.
if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" { if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" {