From 90787301299f227aac69f4460343b6cfc12761b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Valais?= Date: Tue, 4 Apr 2023 11:13:56 +0200 Subject: [PATCH] migrate tests: higher timeout to lower the number of false-positives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maël Valais --- test/integration/ctl/migrate/ctl_upgrade_migrate_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go b/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go index f8dd3dbf4..b8730e1ba 100644 --- a/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go +++ b/test/integration/ctl/migrate/ctl_upgrade_migrate_test.go @@ -74,7 +74,8 @@ func newScheme() *runtime.Scheme { } 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() // 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) { - ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) defer cancel() // 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) { - ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) defer cancel() // 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) { - ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) + ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second) defer cancel() // Create the control plane with the TestType conversion handlers registered