Replace ginkgo When() calls with Context()

It seems like running 'glide up' triggers a downgrade of ginkgo. To get the code to compile it is necessary to replace all When() calls with Context() calls. Since When() is just a newer synonym for Context() this should not be a problem.
kubevirt · Jan 7, 2019 · 1b8dc28 · 1b8dc28
1 parent 0c91173
commit 1b8dc28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/virt-api/webhooks/mutating-webhook/namespace-limits_test.go b/pkg/virt-api/webhooks/mutating-webhook/namespace-limits_test.go
@@ -68,7 +68,7 @@ var _ = Describe("Mutating Webhook Namespace Limits", func() {
 		namespaceLimitInformer.GetIndexer().Add(namespaceLimit)
 	})
 
-	When("VMI has limits under spec", func() {
+	Context("VMI has limits under spec", func() {
 		It("should not apply namespace limits", func() {
 			vmiCopy := vmi.DeepCopy()
 			vmiCopy.Spec.Domain.Resources.Limits = k8sv1.ResourceList{
@@ -81,7 +81,7 @@ var _ = Describe("Mutating Webhook Namespace Limits", func() {
 		})
 	})
 
-	When("VMI does not have limits under spec", func() {
+	Context("VMI does not have limits under spec", func() {
 		It("should apply namespace limits", func() {
 			vmiCopy := vmi.DeepCopy()
 			By("Applying namespace range values on the VMI")
@@ -90,7 +90,7 @@ var _ = Describe("Mutating Webhook Namespace Limits", func() {
 			Expect(vmiCopy.Spec.Domain.Resources.Limits.Memory().String()).To(Equal("128M"))
 		})
 
-		When("namespace limit equals 0", func() {
+		Context("namespace limit equals 0", func() {
 			It("should not apply namespace limits", func() {
 				vmiCopy := vmi.DeepCopy()
 
@@ -109,7 +109,7 @@ var _ = Describe("Mutating Webhook Namespace Limits", func() {
 			})
 		})
 
-		When("namespace has more than one limit range", func() {
+		Context("namespace has more than one limit range", func() {
 			var additionalNamespaceLimit *k8sv1.LimitRange
 
 			BeforeEach(func() {

diff --git a/pkg/virt-api/webhooks/mutating-webhook/preset_test.go b/pkg/virt-api/webhooks/mutating-webhook/preset_test.go
@@ -535,7 +535,7 @@ var _ = Describe("Mutating Webhook Presets", func() {
 			presetInformer, _ = testutils.NewFakeInformerFor(&v1.VirtualMachineInstancePreset{})
 		})
 
-		When("VMI has exclusion annotation", func() {
+		Context("VMI has exclusion annotation", func() {
 			It("Should be skipped", func() {
 				preset.Spec.Domain.CPU = &v1.CPU{Cores: 4}
 				presetInformer.GetIndexer().Add(preset)

diff --git a/tests/template_test.go b/tests/template_test.go
@@ -234,7 +234,7 @@ var _ = Describe("Templates", func() {
 			It("should succeed to create VirtualMachine via oc command", AssertVMCreationSuccess())
 			It("should fail to delete VirtualMachine via oc command", AssertVMDeletionFailure())
 
-			When("the VirtualMachine was created", func() {
+			Context("the VirtualMachine was created", func() {
 				BeforeEach(AssertVMCreationSuccess())
 				It("should succeed to start the VirtualMachine via oc command", AssertVMStartSuccess("oc"))
 				It("should succeed to delete VirtualMachine via oc command", AssertVMDeletionSuccess())