1c028de03a
In order to adopt ginkgo incrementally, let's start by replacing test/e2e/driver.go with a call to ginkgo runner and convert each of the other tests to a small Decscribe() snippet that simply calls the legacy TestXYZ function. From this basis we can take further incremental steps by converting individual tests to native ginkgo format, using Fail() for all failure cases, using By() for logs, enabling JUnit reports, etc. Tested: - cmd/e2e builds and `make check` passes. - Running _output/bin/.../e2e on an alive cluster works. - Running the full hack/e2e-test.sh works as expected.
47 lines
1.5 KiB
Go
47 lines
1.5 KiB
Go
/*
|
|
Copyright 2015 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
|
|
"github.com/golang/glog"
|
|
|
|
. "github.com/onsi/ginkgo"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
// A basic test to check the deployment of the
|
|
// contaier gcr.io/_b_k8s_test/serve_hostname image
|
|
// with the TestBasicImage test. This test is only supported
|
|
// for the providers GCE and GKE.
|
|
func TestPrivate(c *client.Client) bool {
|
|
if testContext.provider != "gce" && testContext.provider != "gke" {
|
|
glog.Infof("Skipping test private which is only supported for providers gce and gke (not %s)", testContext.provider)
|
|
return true
|
|
}
|
|
glog.Info("Calling out to TestBasic")
|
|
return TestBasicImage(c, "private", "gcr.io/_b_k8s_test/serve_hostname:1.0")
|
|
}
|
|
|
|
var _ = Describe("TestPrivate", func() {
|
|
It("should pass", func() {
|
|
// TODO: Instead of OrDie, client should Fail the test if there's a problem.
|
|
// In general tests should Fail() instead of glog.Fatalf().
|
|
Expect(TestPrivate(loadClientOrDie())).To(BeTrue())
|
|
})
|
|
})
|