Make all e2e tests use Framework

This commit is contained in:
Jeff Grafton
2016-02-09 15:50:07 -08:00
parent c1e79e4264
commit 220b5e3e8e
5 changed files with 18 additions and 52 deletions

View File

@@ -20,20 +20,14 @@ import (
"fmt"
"strings"
client "k8s.io/kubernetes/pkg/client/unversioned"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
var _ = Describe("SSH", func() {
var c *client.Client
f := NewFramework("ssh")
BeforeEach(func() {
var err error
c, err = loadClient()
Expect(err).NotTo(HaveOccurred())
// When adding more providers here, also implement their functionality in util.go's getSigner(...).
SkipUnlessProviderIs(providersWithSSH...)
})
@@ -41,7 +35,7 @@ var _ = Describe("SSH", func() {
It("should SSH to all nodes and run commands", func() {
// Get all nodes' external IPs.
By("Getting all nodes' SSH-able IP addresses")
hosts, err := NodeSSHHosts(c)
hosts, err := NodeSSHHosts(f.Client)
if err != nil {
Failf("Error getting node hostnames: %v", err)
}