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

Address review comments and minor panic fixes.

Browse Source
This commit is contained in:
Madhusudan.C.S 2016-09-15 20:31:00 -07:00
parent 557ed2f12f
commit 81ac19a99b
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/e2e/federated-service.go
View File

@ -64,6 +64,11 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
}) })
Describe("Service creation", func() { Describe("Service creation", func() {
var (
service *v1.Service
nsName string
)
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessFederated(f.Client) framework.SkipUnlessFederated(f.Client)
// Placeholder // Placeholder
@ -71,37 +76,37 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
AfterEach(func() { AfterEach(func() {
framework.SkipUnlessFederated(f.Client) framework.SkipUnlessFederated(f.Client)
// Placeholder
if service != nil {
By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName))
cleanupServiceShardsAndProviderResources(nsName, service, clusters)
service = nil
nsName = ""
}
}) })
It("should succeed", func() { It("should succeed", func() {
framework.SkipUnlessFederated(f.Client) framework.SkipUnlessFederated(f.Client)
nsName := f.FederationNamespace.Name nsName = f.FederationNamespace.Name
service := createServiceOrFail(f.FederationClientset_1_4, nsName, FederatedServiceName) service = createServiceOrFail(f.FederationClientset_1_4, nsName, FederatedServiceName)
By(fmt.Sprintf("Creation of service %q in namespace %q succeeded. Deleting service.", service.Name, nsName)) By(fmt.Sprintf("Creation of service %q in namespace %q succeeded. Deleting service.", service.Name, nsName))
// Cleanup // Cleanup
err := f.FederationClientset_1_4.Services(nsName).Delete(service.Name, &api.DeleteOptions{}) err := f.FederationClientset_1_4.Services(nsName).Delete(service.Name, &api.DeleteOptions{})
framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, service.Namespace) framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, service.Namespace)
By(fmt.Sprintf("Deletion of service %q in namespace %q succeeded.", service.Name, nsName)) By(fmt.Sprintf("Deletion of service %q in namespace %q succeeded.", service.Name, nsName))
By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName))
cleanupServiceShardsAndProviderResources(nsName, service, clusters)
}) })
It("should create matching services in underlying clusters", func() { It("should create matching services in underlying clusters", func() {
framework.SkipUnlessFederated(f.Client) framework.SkipUnlessFederated(f.Client)
nsName := f.FederationNamespace.Name nsName = f.FederationNamespace.Name
service := createServiceOrFail(f.FederationClientset_1_4, nsName, FederatedServiceName) service = createServiceOrFail(f.FederationClientset_1_4, nsName, FederatedServiceName)
defer func() { // Cleanup defer func() { // Cleanup
By(fmt.Sprintf("Deleting service %q in namespace %q", service.Name, nsName)) By(fmt.Sprintf("Deleting service %q in namespace %q", service.Name, nsName))
err := f.FederationClientset_1_4.Services(nsName).Delete(service.Name, &api.DeleteOptions{}) err := f.FederationClientset_1_4.Services(nsName).Delete(service.Name, &api.DeleteOptions{})
framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, nsName) framework.ExpectNoError(err, "Error deleting service %q in namespace %q", service.Name, nsName)
By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName))
cleanupServiceShardsAndProviderResources(nsName, service, clusters)
}() }()
waitForServiceShardsOrFail(nsName, service, clusters) waitForServiceShardsOrFail(nsName, service, clusters)
}) })
@ -130,10 +135,11 @@ var _ = framework.KubeDescribe("[Feature:Federation]", func() {
if service != nil { if service != nil {
deleteServiceOrFail(f.FederationClientset_1_4, nsName, service.Name) deleteServiceOrFail(f.FederationClientset_1_4, nsName, service.Name)
service = nil
By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName)) By(fmt.Sprintf("Deleting service shards and their provider resources in underlying clusters for service %q in namespace %q", service.Name, nsName))
cleanupServiceShardsAndProviderResources(nsName, service, clusters) cleanupServiceShardsAndProviderResources(nsName, service, clusters)
service = nil
} else { } else {
By("No service to delete. Service is nil") By("No service to delete. Service is nil")
} }