Merge pull request #5909 from maelvls/flaky
Migrate tests: higher timeout to lower the number of false-positives
This commit is contained in:
commit
3548ce6496
@ -74,7 +74,8 @@ func newScheme() *runtime.Scheme {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCtlUpgradeMigrate(t *testing.T) {
|
func TestCtlUpgradeMigrate(t *testing.T) {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
|
// This test takes about 25 seconds to run. Let's give it enough time.
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Create the control plane with the TestType conversion handlers registered
|
// Create the control plane with the TestType conversion handlers registered
|
||||||
@ -174,7 +175,7 @@ func TestCtlUpgradeMigrate(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCtlUpgradeMigrate_FailsIfStorageVersionDoesNotEqualTargetVersion(t *testing.T) {
|
func TestCtlUpgradeMigrate_FailsIfStorageVersionDoesNotEqualTargetVersion(t *testing.T) {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Create the control plane with the TestType conversion handlers registered
|
// Create the control plane with the TestType conversion handlers registered
|
||||||
@ -226,7 +227,7 @@ func TestCtlUpgradeMigrate_FailsIfStorageVersionDoesNotEqualTargetVersion(t *tes
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCtlUpgradeMigrate_SkipsMigrationIfNothingToDo(t *testing.T) {
|
func TestCtlUpgradeMigrate_SkipsMigrationIfNothingToDo(t *testing.T) {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Create the control plane with the TestType conversion handlers registered
|
// Create the control plane with the TestType conversion handlers registered
|
||||||
@ -286,7 +287,7 @@ func TestCtlUpgradeMigrate_SkipsMigrationIfNothingToDo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCtlUpgradeMigrate_ForcesMigrationIfSkipStoredVersionCheckIsEnabled(t *testing.T) {
|
func TestCtlUpgradeMigrate_ForcesMigrationIfSkipStoredVersionCheckIsEnabled(t *testing.T) {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
|
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
// Create the control plane with the TestType conversion handlers registered
|
// Create the control plane with the TestType conversion handlers registered
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user