Skip to content

Commit

Permalink
test: fix the timeout for tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhiying-lin
zhiying-lin committed Feb 20, 2025
1 parent 676efec commit db6f686
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 109 deletions.
85 changes: 43 additions & 42 deletions pkg/controllers/hub/trafficmanagerbackend/controller_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ import (
)

const (
timeout = time.Second * 10
interval = time.Millisecond * 250
timeout = time.Second * 10
longTimeout = time.Second * 60
interval = time.Millisecond * 250
)

var (
Expand Down Expand Up @@ -132,7 +133,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -141,7 +142,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, namespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, namespacedName, timeout)
})
})

Expand Down Expand Up @@ -175,7 +176,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating TrafficManagerProfile status to programmed true and it should trigger controller", func() {
Expand All @@ -194,7 +195,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -203,7 +204,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -212,7 +213,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -251,7 +252,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -260,7 +261,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -269,7 +270,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -308,7 +309,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -317,7 +318,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -326,7 +327,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -372,7 +373,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating TrafficManagerProfile status to accepted unknown and it should trigger controller", func() {
Expand All @@ -398,7 +399,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -407,7 +408,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -416,7 +417,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -455,7 +456,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -464,7 +465,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -473,7 +474,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -510,7 +511,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Spec: backend.Spec,
// not able to set the condition
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Deleting trafficManagerBackend", func() {
Expand All @@ -519,7 +520,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -528,7 +529,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})
})

Expand Down Expand Up @@ -569,7 +570,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Creating a new ServiceImport", func() {
Expand All @@ -593,7 +594,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
})

It("Updating the ServiceImport status", func() {
Expand Down Expand Up @@ -627,7 +628,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -636,7 +637,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})

It("Deleting serviceImport", func() {
Expand Down Expand Up @@ -681,7 +682,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -706,7 +707,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -749,7 +750,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -778,7 +779,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -808,7 +809,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, longTimeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -862,7 +863,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -909,7 +910,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -952,7 +953,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -982,7 +983,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildUnknownCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -1016,7 +1017,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildFalseCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand Down Expand Up @@ -1052,7 +1053,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
},
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -1074,7 +1075,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
Conditions: buildTrueCondition(backend.Generation),
},
}
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want)
validator.ValidateTrafficManagerBackend(ctx, k8sClient, &want, timeout)
validator.ValidateTrafficManagerBackendConsistently(ctx, k8sClient, &want)
})

Expand All @@ -1084,7 +1085,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerBackend is deleted", func() {
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName)
validator.IsTrafficManagerBackendDeleted(ctx, k8sClient, backendNamespacedName, timeout)
})

It("Deleting trafficManagerProfile", func() {
Expand All @@ -1093,7 +1094,7 @@ var _ = Describe("Test TrafficManagerBackend Controller", func() {
})

It("Validating trafficManagerProfile is deleted", func() {
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName)
validator.IsTrafficManagerProfileDeleted(ctx, k8sClient, profileNamespacedName, timeout)
})

It("Deleting serviceImport", func() {
Expand Down
Loading

0 comments on commit db6f686

Please sign in to comment.