From 6215d2e7d8d3fee43dedaca03556a452a1bc7715 Mon Sep 17 00:00:00 2001 From: Roberto Dip Date: Tue, 14 Nov 2023 13:42:17 -0300 Subject: [PATCH] skip old migration tests (#15130) migrations are static and not meant to change, so these tests have successfully accomplished their purpose. the main motivation is to prevent CI from timming out, as each migration test runs all prior migrations from scratch, making these very time expensive. --- ...ddSoftwareReleaseArchVendorColumns_test.go | 3 +++ .../20220215152203_AddMunkiDeletedAt_test.go | 3 +++ ...3157_UpdateSoftwareHostCountsTable_test.go | 3 +++ .../20220309133956_AddTeamConfig_test.go | 3 +++ ...323152301_CleanupHostRelatedTables_test.go | 3 +++ .../20220330100659_AddJobsTable_test.go | 3 +++ ...4091216_UpdateAppConfigLogEndpoint_test.go | 3 +++ ...140750_AddHostSoftwareLastOpenedAt_test.go | 3 +++ ...20428140039_CleanupEmptyHostEmails_test.go | 3 +++ .../20220503134048_AddCVEScoresTable_test.go | 3 +++ ...8_CleanupOrphanedPolicyMemberships_test.go | 3 +++ ...526123327_RenameCVEScoresToCVEMeta_test.go | 3 +++ ...3128_AddTransparencyURLToAppConfig_test.go | 3 +++ ...220627104817_AddHostBatteriesTable_test.go | 3 +++ ...4101843_AddSoftwareIDInSoftwareCVE_test.go | 3 +++ ...qconstraintSoftwareIDOnSoftwareCVE_test.go | 3 +++ ...713091130_AddOperatingSystemsTable_test.go | 3 +++ ...510_AddMobileDeviceManagementTable_test.go | 3 +++ ...18101352_ChangeSoftwareVendorWidth_test.go | 3 +++ ...20822161445_CreateMunkiIssuesTable_test.go | 3 +++ ...20831100151_AddWindowsUpdatesTable_test.go | 3 +++ ...20908181826_AddOrbitNodeKeyToHosts_test.go | 6 +++++- .../20220915165116_HostDisplayName_test.go | 6 +++++- ...100158_AddHostDeviceAuthTimestamps_test.go | 3 +++ ...014084130_CreateHostOrbitInfoTable_test.go | 3 +++ ...21101103952_AddHostDisksEncryption_test.go | 3 +++ ...100749_RemoveHostsDiskSpaceColumns_test.go | 3 +++ .../20221115104546_AddCronStatsTable_test.go | 3 +++ ...1205112142_AddErrorToCarveMetadata_test.go | 3 +++ ...195934_SetSCEPSerialsAutoIncrement_test.go | 3 +++ ...terHostsTablePendingMDMEnrollments_test.go | 3 +++ ...ptyMobileDeviceManagementSolutions_test.go | 3 +++ ..._CreateHostDiskEncryptionKeysTable_test.go | 3 +++ ...608_AddTableMDMAppleConfigProfiles_test.go | 3 +++ ...31519_AddHostMDMAppleProfilesTable_test.go | 3 +++ ...30303135738_AddMDMIdPAccountsTable_test.go | 3 +++ ...eColumnToHostMDMAppleProfilesTable_test.go | 3 +++ ...0230313141819_AlterAggregatedStats_test.go | 3 +++ ...30315104937_EnsureUniformCollation_test.go | 3 +++ ...173844_CleanupHostMDMAppleProfiles_test.go | 3 +++ ...tRequestedToHostDiskEncryptionKeys_test.go | 3 +++ ...CleanupHostDiskEncryptionKeysTable_test.go | 3 +++ ...823_AddSoftwareCPEUniqueConstraint_test.go | 3 +++ ...05232025_AddBootstrapPackagesTable_test.go | 3 +++ ...230408084104_AddChecksumToProfiles_test.go | 3 +++ ...8_CreateHostBootstrapPackagesTable_test.go | 3 +++ ..._UpdateMdmAppleDeliveryStatusTable_test.go | 3 +++ ...5082126_AddMDMAppleSetupAssistants_test.go | 3 +++ .../20230425105727_AddEulasTable_test.go | 3 +++ ...AppleSetupAssistantsAddProfileUUID_test.go | 3 +++ ...230503101418_AlterJobsAddNotBefore_test.go | 3 +++ ..._AddMDMAppleDefaultSetupAssistants_test.go | 3 +++ ...RefetchCriticalQueriesUntilToHosts_test.go | 3 +++ ...5_AddFullnameToMDMIdPAccountsTable_test.go | 3 +++ ...0153236_AddHostDepAssignmentsTable_test.go | 3 +++ ...erifiedMdmAppleDeliveryStatusTable_test.go | 3 +++ ..._RemoveQueryParamsFromMDMServerURL_test.go | 3 +++ ...hanedMDMAppleConfigurationProfiles_test.go | 3 +++ .../20230629140529_AddWstepTables_test.go | 20 ------------------- ...0530_AddMDMWindowsEnrollmentsTable_test.go | 3 +++ ...4622_SetFileVaultMaxBypassAttempts_test.go | 3 +++ ...20230721161508_QueriesDataMigrator_test.go | 3 +++ ...14150442_AddHostScriptResultsTable_test.go | 3 +++ ...3122728_AddEmailToIdPAccountsTable_test.go | 3 +++ .../20230906152143_AddScriptsTable_test.go | 3 +++ ...iesColumnHostMdmAppleProfilesTable_test.go | 3 +++ ...230912101759_AddDescToCveMetaTable_test.go | 3 +++ ...lientErrorToHostDiskEncryptionKeys_test.go | 3 +++ ..._AddResolvedInVersionToSoftwareCVE_test.go | 3 +++ ...04144339_MoveDiskEncryptionSetting_test.go | 3 +++ ...9094542_AddIndexesToScriptContents_test.go | 3 +++ ...20231009094543_AddDiscardToQueries_test.go | 3 +++ ...1009094544_CreateTableQueryReports_test.go | 3 +++ ...915_FixQueriesWithEmptyLoggingType_test.go | 3 +++ ...74135_RemoveQueryResultsForeignKey_test.go | 3 +++ ...025120016_UniqueEmailInIdpAccounts_test.go | 3 +++ 76 files changed, 229 insertions(+), 22 deletions(-) delete mode 100644 server/datastore/mysql/migrations/tables/20230629140529_AddWstepTables_test.go diff --git a/server/datastore/mysql/migrations/tables/20220208144831_AddSoftwareReleaseArchVendorColumns_test.go b/server/datastore/mysql/migrations/tables/20220208144831_AddSoftwareReleaseArchVendorColumns_test.go index b5fdf7573b..475760e0c9 100644 --- a/server/datastore/mysql/migrations/tables/20220208144831_AddSoftwareReleaseArchVendorColumns_test.go +++ b/server/datastore/mysql/migrations/tables/20220208144831_AddSoftwareReleaseArchVendorColumns_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220208144831(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO software (name, version, source) VALUES ("authconfig", "6.2.8", "rpm_packages")`) diff --git a/server/datastore/mysql/migrations/tables/20220215152203_AddMunkiDeletedAt_test.go b/server/datastore/mysql/migrations/tables/20220215152203_AddMunkiDeletedAt_test.go index a5122cc004..05b7c1ab50 100644 --- a/server/datastore/mysql/migrations/tables/20220215152203_AddMunkiDeletedAt_test.go +++ b/server/datastore/mysql/migrations/tables/20220215152203_AddMunkiDeletedAt_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20220215152203(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) execNoErr(t, db, `INSERT INTO host_munki_info (host_id, version) VALUES (1, "6.2.8")`) diff --git a/server/datastore/mysql/migrations/tables/20220223113157_UpdateSoftwareHostCountsTable_test.go b/server/datastore/mysql/migrations/tables/20220223113157_UpdateSoftwareHostCountsTable_test.go index e92bee9e7d..3a69647a90 100644 --- a/server/datastore/mysql/migrations/tables/20220223113157_UpdateSoftwareHostCountsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220223113157_UpdateSoftwareHostCountsTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20220223113157(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) execNoErr(t, db, `INSERT INTO software_host_counts (software_id, hosts_count) VALUES (1, 1)`) diff --git a/server/datastore/mysql/migrations/tables/20220309133956_AddTeamConfig_test.go b/server/datastore/mysql/migrations/tables/20220309133956_AddTeamConfig_test.go index 88040b584a..b612e04546 100644 --- a/server/datastore/mysql/migrations/tables/20220309133956_AddTeamConfig_test.go +++ b/server/datastore/mysql/migrations/tables/20220309133956_AddTeamConfig_test.go @@ -39,6 +39,9 @@ func (t TeamConfig20220309133956) Value() (driver.Value, error) { } func TestUp_20220309133956(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) teams := []Team20220309133956{ diff --git a/server/datastore/mysql/migrations/tables/20220323152301_CleanupHostRelatedTables_test.go b/server/datastore/mysql/migrations/tables/20220323152301_CleanupHostRelatedTables_test.go index 1546802218..3559cd44e4 100644 --- a/server/datastore/mysql/migrations/tables/20220323152301_CleanupHostRelatedTables_test.go +++ b/server/datastore/mysql/migrations/tables/20220323152301_CleanupHostRelatedTables_test.go @@ -13,6 +13,9 @@ import ( ) func TestUp_20220323152301(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) hosts := createHostsWithSoftware(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220330100659_AddJobsTable_test.go b/server/datastore/mysql/migrations/tables/20220330100659_AddJobsTable_test.go index 4d0a3c430c..56fdac8434 100644 --- a/server/datastore/mysql/migrations/tables/20220330100659_AddJobsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220330100659_AddJobsTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220330100659(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220404091216_UpdateAppConfigLogEndpoint_test.go b/server/datastore/mysql/migrations/tables/20220404091216_UpdateAppConfigLogEndpoint_test.go index f170ca77b1..85f7e5af0a 100644 --- a/server/datastore/mysql/migrations/tables/20220404091216_UpdateAppConfigLogEndpoint_test.go +++ b/server/datastore/mysql/migrations/tables/20220404091216_UpdateAppConfigLogEndpoint_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20220404091216(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // must be done in top-level test as the migration comes from the test name t.Run("no entry", func(t *testing.T) { _, err := db.Exec(`DELETE FROM app_config_json`) diff --git a/server/datastore/mysql/migrations/tables/20220419140750_AddHostSoftwareLastOpenedAt_test.go b/server/datastore/mysql/migrations/tables/20220419140750_AddHostSoftwareLastOpenedAt_test.go index 6fc6e2a67d..2e61e07f39 100644 --- a/server/datastore/mysql/migrations/tables/20220419140750_AddHostSoftwareLastOpenedAt_test.go +++ b/server/datastore/mysql/migrations/tables/20220419140750_AddHostSoftwareLastOpenedAt_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20220419140750(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO host_software (host_id, software_id) VALUES (1, 1)`) diff --git a/server/datastore/mysql/migrations/tables/20220428140039_CleanupEmptyHostEmails_test.go b/server/datastore/mysql/migrations/tables/20220428140039_CleanupEmptyHostEmails_test.go index 95f7a41dba..117d0bf1f8 100644 --- a/server/datastore/mysql/migrations/tables/20220428140039_CleanupEmptyHostEmails_test.go +++ b/server/datastore/mysql/migrations/tables/20220428140039_CleanupEmptyHostEmails_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220428140039(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) const insStmt = `INSERT INTO host_emails (host_id, email, source) VALUES (?, ?, ?)` diff --git a/server/datastore/mysql/migrations/tables/20220503134048_AddCVEScoresTable_test.go b/server/datastore/mysql/migrations/tables/20220503134048_AddCVEScoresTable_test.go index b5eb7fa5cc..e25176b4eb 100644 --- a/server/datastore/mysql/migrations/tables/20220503134048_AddCVEScoresTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220503134048_AddCVEScoresTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220503134048(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220524102918_CleanupOrphanedPolicyMemberships_test.go b/server/datastore/mysql/migrations/tables/20220524102918_CleanupOrphanedPolicyMemberships_test.go index b250fa894e..6a266f588b 100644 --- a/server/datastore/mysql/migrations/tables/20220524102918_CleanupOrphanedPolicyMemberships_test.go +++ b/server/datastore/mysql/migrations/tables/20220524102918_CleanupOrphanedPolicyMemberships_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220524102918(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) res, err := db.Exec(` diff --git a/server/datastore/mysql/migrations/tables/20220526123327_RenameCVEScoresToCVEMeta_test.go b/server/datastore/mysql/migrations/tables/20220526123327_RenameCVEScoresToCVEMeta_test.go index 5939810d18..c3e76583af 100644 --- a/server/datastore/mysql/migrations/tables/20220526123327_RenameCVEScoresToCVEMeta_test.go +++ b/server/datastore/mysql/migrations/tables/20220526123327_RenameCVEScoresToCVEMeta_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20220526123327(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220608113128_AddTransparencyURLToAppConfig_test.go b/server/datastore/mysql/migrations/tables/20220608113128_AddTransparencyURLToAppConfig_test.go index 265c512714..dacbd10e03 100644 --- a/server/datastore/mysql/migrations/tables/20220608113128_AddTransparencyURLToAppConfig_test.go +++ b/server/datastore/mysql/migrations/tables/20220608113128_AddTransparencyURLToAppConfig_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20220608113128(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) var prevRaw []byte diff --git a/server/datastore/mysql/migrations/tables/20220627104817_AddHostBatteriesTable_test.go b/server/datastore/mysql/migrations/tables/20220627104817_AddHostBatteriesTable_test.go index ebb17e2f04..8b7c85d32c 100644 --- a/server/datastore/mysql/migrations/tables/20220627104817_AddHostBatteriesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220627104817_AddHostBatteriesTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220627104817(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220704101843_AddSoftwareIDInSoftwareCVE_test.go b/server/datastore/mysql/migrations/tables/20220704101843_AddSoftwareIDInSoftwareCVE_test.go index 6917e45fd5..4fcd719274 100644 --- a/server/datastore/mysql/migrations/tables/20220704101843_AddSoftwareIDInSoftwareCVE_test.go +++ b/server/datastore/mysql/migrations/tables/20220704101843_AddSoftwareIDInSoftwareCVE_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220704101843(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO software (id, name, version, source, bundle_identifier, vendor, arch) diff --git a/server/datastore/mysql/migrations/tables/20220708095046_AddUniqconstraintSoftwareIDOnSoftwareCVE_test.go b/server/datastore/mysql/migrations/tables/20220708095046_AddUniqconstraintSoftwareIDOnSoftwareCVE_test.go index b8ecd8d999..5140b89fdd 100644 --- a/server/datastore/mysql/migrations/tables/20220708095046_AddUniqconstraintSoftwareIDOnSoftwareCVE_test.go +++ b/server/datastore/mysql/migrations/tables/20220708095046_AddUniqconstraintSoftwareIDOnSoftwareCVE_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220708095046(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO software (id, name, version, source, bundle_identifier, vendor, arch) VALUES (1, 'zchunk-libs', '1.2.1', 'rpm_packages', '', 'Fedora Project','x86_64');`) diff --git a/server/datastore/mysql/migrations/tables/20220713091130_AddOperatingSystemsTable_test.go b/server/datastore/mysql/migrations/tables/20220713091130_AddOperatingSystemsTable_test.go index 975399278d..c6bd334568 100644 --- a/server/datastore/mysql/migrations/tables/20220713091130_AddOperatingSystemsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220713091130_AddOperatingSystemsTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220713091130(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220802135510_AddMobileDeviceManagementTable_test.go b/server/datastore/mysql/migrations/tables/20220802135510_AddMobileDeviceManagementTable_test.go index 885b6c4a68..b6d6e7aceb 100644 --- a/server/datastore/mysql/migrations/tables/20220802135510_AddMobileDeviceManagementTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220802135510_AddMobileDeviceManagementTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220802135510(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220818101352_ChangeSoftwareVendorWidth_test.go b/server/datastore/mysql/migrations/tables/20220818101352_ChangeSoftwareVendorWidth_test.go index b50b1f0a43..d226068ab2 100644 --- a/server/datastore/mysql/migrations/tables/20220818101352_ChangeSoftwareVendorWidth_test.go +++ b/server/datastore/mysql/migrations/tables/20220818101352_ChangeSoftwareVendorWidth_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220818101352(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO software (name, version, source, bundle_identifier, vendor, arch) diff --git a/server/datastore/mysql/migrations/tables/20220822161445_CreateMunkiIssuesTable_test.go b/server/datastore/mysql/migrations/tables/20220822161445_CreateMunkiIssuesTable_test.go index d79eaa1234..58804c4598 100644 --- a/server/datastore/mysql/migrations/tables/20220822161445_CreateMunkiIssuesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220822161445_CreateMunkiIssuesTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20220822161445(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220831100151_AddWindowsUpdatesTable_test.go b/server/datastore/mysql/migrations/tables/20220831100151_AddWindowsUpdatesTable_test.go index 631d037b96..8c7af424f8 100644 --- a/server/datastore/mysql/migrations/tables/20220831100151_AddWindowsUpdatesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20220831100151_AddWindowsUpdatesTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20220831100151(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20220908181826_AddOrbitNodeKeyToHosts_test.go b/server/datastore/mysql/migrations/tables/20220908181826_AddOrbitNodeKeyToHosts_test.go index f76294b311..7d0f2572ec 100644 --- a/server/datastore/mysql/migrations/tables/20220908181826_AddOrbitNodeKeyToHosts_test.go +++ b/server/datastore/mysql/migrations/tables/20220908181826_AddOrbitNodeKeyToHosts_test.go @@ -1,12 +1,16 @@ package tables import ( - "github.com/stretchr/testify/require" "testing" "time" + + "github.com/stretchr/testify/require" ) func TestUp_20220908181826(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) zeroTime := time.Unix(0, 0).Add(24 * time.Hour) diff --git a/server/datastore/mysql/migrations/tables/20220915165116_HostDisplayName_test.go b/server/datastore/mysql/migrations/tables/20220915165116_HostDisplayName_test.go index c0d96233fe..abe20d306e 100644 --- a/server/datastore/mysql/migrations/tables/20220915165116_HostDisplayName_test.go +++ b/server/datastore/mysql/migrations/tables/20220915165116_HostDisplayName_test.go @@ -1,11 +1,15 @@ package tables import ( - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" ) func TestUp_20220915165116(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(` diff --git a/server/datastore/mysql/migrations/tables/20220928100158_AddHostDeviceAuthTimestamps_test.go b/server/datastore/mysql/migrations/tables/20220928100158_AddHostDeviceAuthTimestamps_test.go index 3568d217a0..c66673abc1 100644 --- a/server/datastore/mysql/migrations/tables/20220928100158_AddHostDeviceAuthTimestamps_test.go +++ b/server/datastore/mysql/migrations/tables/20220928100158_AddHostDeviceAuthTimestamps_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20220928100158(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO host_device_auth (host_id, token) VALUES (1, 'abcd')`) diff --git a/server/datastore/mysql/migrations/tables/20221014084130_CreateHostOrbitInfoTable_test.go b/server/datastore/mysql/migrations/tables/20221014084130_CreateHostOrbitInfoTable_test.go index 67ef4bd68c..a270d5fc55 100644 --- a/server/datastore/mysql/migrations/tables/20221014084130_CreateHostOrbitInfoTable_test.go +++ b/server/datastore/mysql/migrations/tables/20221014084130_CreateHostOrbitInfoTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20221014084130(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20221101103952_AddHostDisksEncryption_test.go b/server/datastore/mysql/migrations/tables/20221101103952_AddHostDisksEncryption_test.go index d7bfc81f3d..89975b53bc 100644 --- a/server/datastore/mysql/migrations/tables/20221101103952_AddHostDisksEncryption_test.go +++ b/server/datastore/mysql/migrations/tables/20221101103952_AddHostDisksEncryption_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20221101103952(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO host_disks (host_id, gigs_disk_space_available, percent_disk_space_available) VALUES (1, 35, 70.5)`) diff --git a/server/datastore/mysql/migrations/tables/20221109100749_RemoveHostsDiskSpaceColumns_test.go b/server/datastore/mysql/migrations/tables/20221109100749_RemoveHostsDiskSpaceColumns_test.go index 6671fd33bf..19194bf52f 100644 --- a/server/datastore/mysql/migrations/tables/20221109100749_RemoveHostsDiskSpaceColumns_test.go +++ b/server/datastore/mysql/migrations/tables/20221109100749_RemoveHostsDiskSpaceColumns_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20221109100749(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO hosts (hostname, osquery_host_id, gigs_disk_space_available, percent_disk_space_available) VALUES ('h1', 'ohid', 35, 70.5)`) diff --git a/server/datastore/mysql/migrations/tables/20221115104546_AddCronStatsTable_test.go b/server/datastore/mysql/migrations/tables/20221115104546_AddCronStatsTable_test.go index 33411c0beb..4e0ee1094b 100644 --- a/server/datastore/mysql/migrations/tables/20221115104546_AddCronStatsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20221115104546_AddCronStatsTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20221115104546(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20221205112142_AddErrorToCarveMetadata_test.go b/server/datastore/mysql/migrations/tables/20221205112142_AddErrorToCarveMetadata_test.go index 569c06764e..d7922d367b 100644 --- a/server/datastore/mysql/migrations/tables/20221205112142_AddErrorToCarveMetadata_test.go +++ b/server/datastore/mysql/migrations/tables/20221205112142_AddErrorToCarveMetadata_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20221205112142(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) query := ` INSERT INTO carve_metadata diff --git a/server/datastore/mysql/migrations/tables/20221220195934_SetSCEPSerialsAutoIncrement_test.go b/server/datastore/mysql/migrations/tables/20221220195934_SetSCEPSerialsAutoIncrement_test.go index 407dcc46df..760d44aee2 100644 --- a/server/datastore/mysql/migrations/tables/20221220195934_SetSCEPSerialsAutoIncrement_test.go +++ b/server/datastore/mysql/migrations/tables/20221220195934_SetSCEPSerialsAutoIncrement_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20221220195934(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) var count int err := db.Get(&count, "SELECT COUNT(*) FROM scep_serials") diff --git a/server/datastore/mysql/migrations/tables/20221223174807_AlterHostsTablePendingMDMEnrollments_test.go b/server/datastore/mysql/migrations/tables/20221223174807_AlterHostsTablePendingMDMEnrollments_test.go index 13bf235f38..58a8084d97 100644 --- a/server/datastore/mysql/migrations/tables/20221223174807_AlterHostsTablePendingMDMEnrollments_test.go +++ b/server/datastore/mysql/migrations/tables/20221223174807_AlterHostsTablePendingMDMEnrollments_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20221223174807(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) someString := func() string { diff --git a/server/datastore/mysql/migrations/tables/20221227163855_CleanupEmptyMobileDeviceManagementSolutions_test.go b/server/datastore/mysql/migrations/tables/20221227163855_CleanupEmptyMobileDeviceManagementSolutions_test.go index 995cdeafdd..5ecd0121ee 100644 --- a/server/datastore/mysql/migrations/tables/20221227163855_CleanupEmptyMobileDeviceManagementSolutions_test.go +++ b/server/datastore/mysql/migrations/tables/20221227163855_CleanupEmptyMobileDeviceManagementSolutions_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20221227163855(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) execNoErr(t, db, ` diff --git a/server/datastore/mysql/migrations/tables/20230202224725_CreateHostDiskEncryptionKeysTable_test.go b/server/datastore/mysql/migrations/tables/20230202224725_CreateHostDiskEncryptionKeysTable_test.go index 63ee45f53e..b8ef58ce19 100644 --- a/server/datastore/mysql/migrations/tables/20230202224725_CreateHostDiskEncryptionKeysTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230202224725_CreateHostDiskEncryptionKeysTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230202224725(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230206163608_AddTableMDMAppleConfigProfiles_test.go b/server/datastore/mysql/migrations/tables/20230206163608_AddTableMDMAppleConfigProfiles_test.go index a983028bd1..dc39c5b9df 100644 --- a/server/datastore/mysql/migrations/tables/20230206163608_AddTableMDMAppleConfigProfiles_test.go +++ b/server/datastore/mysql/migrations/tables/20230206163608_AddTableMDMAppleConfigProfiles_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230206163608(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230214131519_AddHostMDMAppleProfilesTable_test.go b/server/datastore/mysql/migrations/tables/20230214131519_AddHostMDMAppleProfilesTable_test.go index 1a6a4347be..4baec1e413 100644 --- a/server/datastore/mysql/migrations/tables/20230214131519_AddHostMDMAppleProfilesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230214131519_AddHostMDMAppleProfilesTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230214131519(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230303135738_AddMDMIdPAccountsTable_test.go b/server/datastore/mysql/migrations/tables/20230303135738_AddMDMIdPAccountsTable_test.go index e4b67eb3fb..08af493cb3 100644 --- a/server/datastore/mysql/migrations/tables/20230303135738_AddMDMIdPAccountsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230303135738_AddMDMIdPAccountsTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230303135738(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230313135301_AddProfileNameColumnToHostMDMAppleProfilesTable_test.go b/server/datastore/mysql/migrations/tables/20230313135301_AddProfileNameColumnToHostMDMAppleProfilesTable_test.go index 90090f9df0..dfd5900242 100644 --- a/server/datastore/mysql/migrations/tables/20230313135301_AddProfileNameColumnToHostMDMAppleProfilesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230313135301_AddProfileNameColumnToHostMDMAppleProfilesTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230313135301(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) stmt := ` diff --git a/server/datastore/mysql/migrations/tables/20230313141819_AlterAggregatedStats_test.go b/server/datastore/mysql/migrations/tables/20230313141819_AlterAggregatedStats_test.go index 92efb141bf..38b1e272ee 100644 --- a/server/datastore/mysql/migrations/tables/20230313141819_AlterAggregatedStats_test.go +++ b/server/datastore/mysql/migrations/tables/20230313141819_AlterAggregatedStats_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230313141819(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) oldInsertStmt := ` diff --git a/server/datastore/mysql/migrations/tables/20230315104937_EnsureUniformCollation_test.go b/server/datastore/mysql/migrations/tables/20230315104937_EnsureUniformCollation_test.go index a1c1f71893..75b7f78eb7 100644 --- a/server/datastore/mysql/migrations/tables/20230315104937_EnsureUniformCollation_test.go +++ b/server/datastore/mysql/migrations/tables/20230315104937_EnsureUniformCollation_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230315104937(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec("SET FOREIGN_KEY_CHECKS = 0") require.NoError(t, err) diff --git a/server/datastore/mysql/migrations/tables/20230317173844_CleanupHostMDMAppleProfiles_test.go b/server/datastore/mysql/migrations/tables/20230317173844_CleanupHostMDMAppleProfiles_test.go index 5b1e3e6086..2f50a48232 100644 --- a/server/datastore/mysql/migrations/tables/20230317173844_CleanupHostMDMAppleProfiles_test.go +++ b/server/datastore/mysql/migrations/tables/20230317173844_CleanupHostMDMAppleProfiles_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230317173844(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` diff --git a/server/datastore/mysql/migrations/tables/20230320133602_AddResetRequestedToHostDiskEncryptionKeys_test.go b/server/datastore/mysql/migrations/tables/20230320133602_AddResetRequestedToHostDiskEncryptionKeys_test.go index 0d5c27a4a8..7d7cc11429 100644 --- a/server/datastore/mysql/migrations/tables/20230320133602_AddResetRequestedToHostDiskEncryptionKeys_test.go +++ b/server/datastore/mysql/migrations/tables/20230320133602_AddResetRequestedToHostDiskEncryptionKeys_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230320133602(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO host_disk_encryption_keys (host_id, base64_encrypted, decryptable) VALUES (1, 'asdf', 0) `) diff --git a/server/datastore/mysql/migrations/tables/20230330100011_CleanupHostDiskEncryptionKeysTable_test.go b/server/datastore/mysql/migrations/tables/20230330100011_CleanupHostDiskEncryptionKeysTable_test.go index b2d462aa88..7441a6cf2e 100644 --- a/server/datastore/mysql/migrations/tables/20230330100011_CleanupHostDiskEncryptionKeysTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230330100011_CleanupHostDiskEncryptionKeysTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230330100011(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // diff --git a/server/datastore/mysql/migrations/tables/20230330134823_AddSoftwareCPEUniqueConstraint_test.go b/server/datastore/mysql/migrations/tables/20230330134823_AddSoftwareCPEUniqueConstraint_test.go index 03727fb3fa..579bae94d2 100644 --- a/server/datastore/mysql/migrations/tables/20230330134823_AddSoftwareCPEUniqueConstraint_test.go +++ b/server/datastore/mysql/migrations/tables/20230330134823_AddSoftwareCPEUniqueConstraint_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230330134823(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) _, err := db.Exec(`INSERT INTO software (id, name, version, source, bundle_identifier, vendor, arch) diff --git a/server/datastore/mysql/migrations/tables/20230405232025_AddBootstrapPackagesTable_test.go b/server/datastore/mysql/migrations/tables/20230405232025_AddBootstrapPackagesTable_test.go index 6a106223e6..1977f9ec8f 100644 --- a/server/datastore/mysql/migrations/tables/20230405232025_AddBootstrapPackagesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230405232025_AddBootstrapPackagesTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230405232025(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230408084104_AddChecksumToProfiles_test.go b/server/datastore/mysql/migrations/tables/20230408084104_AddChecksumToProfiles_test.go index 9c75397dcc..83165c319a 100644 --- a/server/datastore/mysql/migrations/tables/20230408084104_AddChecksumToProfiles_test.go +++ b/server/datastore/mysql/migrations/tables/20230408084104_AddChecksumToProfiles_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230408084104(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) stmt := ` INSERT INTO diff --git a/server/datastore/mysql/migrations/tables/20230411102858_CreateHostBootstrapPackagesTable_test.go b/server/datastore/mysql/migrations/tables/20230411102858_CreateHostBootstrapPackagesTable_test.go index dc520cde19..2816cc1b88 100644 --- a/server/datastore/mysql/migrations/tables/20230411102858_CreateHostBootstrapPackagesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230411102858_CreateHostBootstrapPackagesTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230411102858(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230421155932_UpdateMdmAppleDeliveryStatusTable_test.go b/server/datastore/mysql/migrations/tables/20230421155932_UpdateMdmAppleDeliveryStatusTable_test.go index 6e84ae300e..fc4eeaaddd 100644 --- a/server/datastore/mysql/migrations/tables/20230421155932_UpdateMdmAppleDeliveryStatusTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230421155932_UpdateMdmAppleDeliveryStatusTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230421155932(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) var statuses []string diff --git a/server/datastore/mysql/migrations/tables/20230425082126_AddMDMAppleSetupAssistants_test.go b/server/datastore/mysql/migrations/tables/20230425082126_AddMDMAppleSetupAssistants_test.go index 500d21b07f..2c20d6be02 100644 --- a/server/datastore/mysql/migrations/tables/20230425082126_AddMDMAppleSetupAssistants_test.go +++ b/server/datastore/mysql/migrations/tables/20230425082126_AddMDMAppleSetupAssistants_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230425082126(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // Apply current migration. diff --git a/server/datastore/mysql/migrations/tables/20230425105727_AddEulasTable_test.go b/server/datastore/mysql/migrations/tables/20230425105727_AddEulasTable_test.go index 7e5f6b3815..049e5df656 100644 --- a/server/datastore/mysql/migrations/tables/20230425105727_AddEulasTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230425105727_AddEulasTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230425105727(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230501154913_AlterMDMAppleSetupAssistantsAddProfileUUID_test.go b/server/datastore/mysql/migrations/tables/20230501154913_AlterMDMAppleSetupAssistantsAddProfileUUID_test.go index 552902aa3f..b7c1e01e6c 100644 --- a/server/datastore/mysql/migrations/tables/20230501154913_AlterMDMAppleSetupAssistantsAddProfileUUID_test.go +++ b/server/datastore/mysql/migrations/tables/20230501154913_AlterMDMAppleSetupAssistantsAddProfileUUID_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230501154913(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) r, err := db.Exec(`INSERT INTO mdm_apple_setup_assistants (name, profile) VALUES (?, ?)`, "Test", "{}") diff --git a/server/datastore/mysql/migrations/tables/20230503101418_AlterJobsAddNotBefore_test.go b/server/datastore/mysql/migrations/tables/20230503101418_AlterJobsAddNotBefore_test.go index 2d2f64926e..bd7178190a 100644 --- a/server/datastore/mysql/migrations/tables/20230503101418_AlterJobsAddNotBefore_test.go +++ b/server/datastore/mysql/migrations/tables/20230503101418_AlterJobsAddNotBefore_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230503101418(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) r, err := db.Exec(`INSERT INTO jobs (name, args, state) VALUES (?, ?, ?)`, "Test", "{}", "queued") diff --git a/server/datastore/mysql/migrations/tables/20230515144206_AddMDMAppleDefaultSetupAssistants_test.go b/server/datastore/mysql/migrations/tables/20230515144206_AddMDMAppleDefaultSetupAssistants_test.go index 70c6f9caab..85258de12e 100644 --- a/server/datastore/mysql/migrations/tables/20230515144206_AddMDMAppleDefaultSetupAssistants_test.go +++ b/server/datastore/mysql/migrations/tables/20230515144206_AddMDMAppleDefaultSetupAssistants_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230515144206(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // Apply current migration. diff --git a/server/datastore/mysql/migrations/tables/20230517152807_AddRefetchCriticalQueriesUntilToHosts_test.go b/server/datastore/mysql/migrations/tables/20230517152807_AddRefetchCriticalQueriesUntilToHosts_test.go index 29562050c8..e77b9ed7d1 100644 --- a/server/datastore/mysql/migrations/tables/20230517152807_AddRefetchCriticalQueriesUntilToHosts_test.go +++ b/server/datastore/mysql/migrations/tables/20230517152807_AddRefetchCriticalQueriesUntilToHosts_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230517152807(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) someString := func() string { diff --git a/server/datastore/mysql/migrations/tables/20230518114155_AddFullnameToMDMIdPAccountsTable_test.go b/server/datastore/mysql/migrations/tables/20230518114155_AddFullnameToMDMIdPAccountsTable_test.go index 3f0c8fc745..d32fcecd6e 100644 --- a/server/datastore/mysql/migrations/tables/20230518114155_AddFullnameToMDMIdPAccountsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230518114155_AddFullnameToMDMIdPAccountsTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230518114155(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` diff --git a/server/datastore/mysql/migrations/tables/20230520153236_AddHostDepAssignmentsTable_test.go b/server/datastore/mysql/migrations/tables/20230520153236_AddHostDepAssignmentsTable_test.go index adadf1e0fc..0a85689008 100644 --- a/server/datastore/mysql/migrations/tables/20230520153236_AddHostDepAssignmentsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230520153236_AddHostDepAssignmentsTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230520153236(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230530122103_InsertVerifiedMdmAppleDeliveryStatusTable_test.go b/server/datastore/mysql/migrations/tables/20230530122103_InsertVerifiedMdmAppleDeliveryStatusTable_test.go index 810843619c..96e6ac6426 100644 --- a/server/datastore/mysql/migrations/tables/20230530122103_InsertVerifiedMdmAppleDeliveryStatusTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230530122103_InsertVerifiedMdmAppleDeliveryStatusTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230530122103(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) var statuses []string diff --git a/server/datastore/mysql/migrations/tables/20230602111827_RemoveQueryParamsFromMDMServerURL_test.go b/server/datastore/mysql/migrations/tables/20230602111827_RemoveQueryParamsFromMDMServerURL_test.go index 15e38e16aa..34d299f247 100644 --- a/server/datastore/mysql/migrations/tables/20230602111827_RemoveQueryParamsFromMDMServerURL_test.go +++ b/server/datastore/mysql/migrations/tables/20230602111827_RemoveQueryParamsFromMDMServerURL_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230602111827(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertMDMSolutionStmt := `INSERT INTO mobile_device_management_solutions (id, name, server_url) VALUES (?, ?, ?)` _, err := db.Exec(insertMDMSolutionStmt, 1, "foo", "https://test.example.com?test=1") diff --git a/server/datastore/mysql/migrations/tables/20230608103123_CleanupOrphanedMDMAppleConfigurationProfiles_test.go b/server/datastore/mysql/migrations/tables/20230608103123_CleanupOrphanedMDMAppleConfigurationProfiles_test.go index ca6ff0d6f0..a35415f192 100644 --- a/server/datastore/mysql/migrations/tables/20230608103123_CleanupOrphanedMDMAppleConfigurationProfiles_test.go +++ b/server/datastore/mysql/migrations/tables/20230608103123_CleanupOrphanedMDMAppleConfigurationProfiles_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230608103123(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertProfStmt := "INSERT INTO mdm_apple_configuration_profiles (team_id, identifier, name, mobileconfig, checksum) VALUES (?, ?, ?, ?, 'made up')" diff --git a/server/datastore/mysql/migrations/tables/20230629140529_AddWstepTables_test.go b/server/datastore/mysql/migrations/tables/20230629140529_AddWstepTables_test.go deleted file mode 100644 index 1d2147d39f..0000000000 --- a/server/datastore/mysql/migrations/tables/20230629140529_AddWstepTables_test.go +++ /dev/null @@ -1,20 +0,0 @@ -package tables - -import "testing" - -func TestUp_20230629140529(t *testing.T) { - db := applyUpToPrev(t) - - // - // Insert data to test the migration - // - // ... - - // Apply current migration. - applyNext(t, db) - - // - // Check data, insert new entries, e.g. to verify migration is safe. - // - // ... -} diff --git a/server/datastore/mysql/migrations/tables/20230629140530_AddMDMWindowsEnrollmentsTable_test.go b/server/datastore/mysql/migrations/tables/20230629140530_AddMDMWindowsEnrollmentsTable_test.go index a59718b58a..b9c904f452 100644 --- a/server/datastore/mysql/migrations/tables/20230629140530_AddMDMWindowsEnrollmentsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230629140530_AddMDMWindowsEnrollmentsTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230629140530(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20230711144622_SetFileVaultMaxBypassAttempts_test.go b/server/datastore/mysql/migrations/tables/20230711144622_SetFileVaultMaxBypassAttempts_test.go index c885a73447..3728203f24 100644 --- a/server/datastore/mysql/migrations/tables/20230711144622_SetFileVaultMaxBypassAttempts_test.go +++ b/server/datastore/mysql/migrations/tables/20230711144622_SetFileVaultMaxBypassAttempts_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230711144622(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) stmt := ` diff --git a/server/datastore/mysql/migrations/tables/20230721161508_QueriesDataMigrator_test.go b/server/datastore/mysql/migrations/tables/20230721161508_QueriesDataMigrator_test.go index f1d7ec9f89..4916461b89 100644 --- a/server/datastore/mysql/migrations/tables/20230721161508_QueriesDataMigrator_test.go +++ b/server/datastore/mysql/migrations/tables/20230721161508_QueriesDataMigrator_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230721161508(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) dataStmts := ` diff --git a/server/datastore/mysql/migrations/tables/20230814150442_AddHostScriptResultsTable_test.go b/server/datastore/mysql/migrations/tables/20230814150442_AddHostScriptResultsTable_test.go index 2a5a87dd2e..1998315de0 100644 --- a/server/datastore/mysql/migrations/tables/20230814150442_AddHostScriptResultsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230814150442_AddHostScriptResultsTable_test.go @@ -10,6 +10,9 @@ import ( ) func TestUp_20230814150442(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // Apply current migration. diff --git a/server/datastore/mysql/migrations/tables/20230823122728_AddEmailToIdPAccountsTable_test.go b/server/datastore/mysql/migrations/tables/20230823122728_AddEmailToIdPAccountsTable_test.go index 29b0901d86..9009a6d05f 100644 --- a/server/datastore/mysql/migrations/tables/20230823122728_AddEmailToIdPAccountsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230823122728_AddEmailToIdPAccountsTable_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230823122728(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` INSERT INTO mdm_idp_accounts diff --git a/server/datastore/mysql/migrations/tables/20230906152143_AddScriptsTable_test.go b/server/datastore/mysql/migrations/tables/20230906152143_AddScriptsTable_test.go index f6b12f59a1..3eb6566c45 100644 --- a/server/datastore/mysql/migrations/tables/20230906152143_AddScriptsTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230906152143_AddScriptsTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230906152143(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) const ( diff --git a/server/datastore/mysql/migrations/tables/20230911163618_AddRetriesColumnHostMdmAppleProfilesTable_test.go b/server/datastore/mysql/migrations/tables/20230911163618_AddRetriesColumnHostMdmAppleProfilesTable_test.go index 7aa3676cb4..1aa2069b1a 100644 --- a/server/datastore/mysql/migrations/tables/20230911163618_AddRetriesColumnHostMdmAppleProfilesTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230911163618_AddRetriesColumnHostMdmAppleProfilesTable_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20230911163618(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` INSERT INTO host_mdm_apple_profiles ( diff --git a/server/datastore/mysql/migrations/tables/20230912101759_AddDescToCveMetaTable_test.go b/server/datastore/mysql/migrations/tables/20230912101759_AddDescToCveMetaTable_test.go index a64af5bdfd..dd61726375 100644 --- a/server/datastore/mysql/migrations/tables/20230912101759_AddDescToCveMetaTable_test.go +++ b/server/datastore/mysql/migrations/tables/20230912101759_AddDescToCveMetaTable_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20230912101759(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` INSERT INTO cve_meta diff --git a/server/datastore/mysql/migrations/tables/20230915101341_AddColumnClientErrorToHostDiskEncryptionKeys_test.go b/server/datastore/mysql/migrations/tables/20230915101341_AddColumnClientErrorToHostDiskEncryptionKeys_test.go index ce1a6f0271..93715bb570 100644 --- a/server/datastore/mysql/migrations/tables/20230915101341_AddColumnClientErrorToHostDiskEncryptionKeys_test.go +++ b/server/datastore/mysql/migrations/tables/20230915101341_AddColumnClientErrorToHostDiskEncryptionKeys_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230915101341(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` INSERT INTO host_disk_encryption_keys diff --git a/server/datastore/mysql/migrations/tables/20230918132351_AddResolvedInVersionToSoftwareCVE_test.go b/server/datastore/mysql/migrations/tables/20230918132351_AddResolvedInVersionToSoftwareCVE_test.go index aee7202ed8..9c350203de 100644 --- a/server/datastore/mysql/migrations/tables/20230918132351_AddResolvedInVersionToSoftwareCVE_test.go +++ b/server/datastore/mysql/migrations/tables/20230918132351_AddResolvedInVersionToSoftwareCVE_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20230918132351(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := ` diff --git a/server/datastore/mysql/migrations/tables/20231004144339_MoveDiskEncryptionSetting_test.go b/server/datastore/mysql/migrations/tables/20231004144339_MoveDiskEncryptionSetting_test.go index 78e7600537..beff7d9343 100644 --- a/server/datastore/mysql/migrations/tables/20231004144339_MoveDiskEncryptionSetting_test.go +++ b/server/datastore/mysql/migrations/tables/20231004144339_MoveDiskEncryptionSetting_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20231004144339(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) dataStmts := ` diff --git a/server/datastore/mysql/migrations/tables/20231009094542_AddIndexesToScriptContents_test.go b/server/datastore/mysql/migrations/tables/20231009094542_AddIndexesToScriptContents_test.go index 6e4de0d128..51e43415a4 100644 --- a/server/datastore/mysql/migrations/tables/20231009094542_AddIndexesToScriptContents_test.go +++ b/server/datastore/mysql/migrations/tables/20231009094542_AddIndexesToScriptContents_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20231009094542(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) idxExists := indexExists(db, "scripts", "idx_scripts_team_name") diff --git a/server/datastore/mysql/migrations/tables/20231009094543_AddDiscardToQueries_test.go b/server/datastore/mysql/migrations/tables/20231009094543_AddDiscardToQueries_test.go index dc848ea2e0..802753ff0b 100644 --- a/server/datastore/mysql/migrations/tables/20231009094543_AddDiscardToQueries_test.go +++ b/server/datastore/mysql/migrations/tables/20231009094543_AddDiscardToQueries_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20231009094543(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) applyNext(t, db) diff --git a/server/datastore/mysql/migrations/tables/20231009094544_CreateTableQueryReports_test.go b/server/datastore/mysql/migrations/tables/20231009094544_CreateTableQueryReports_test.go index 028af521a8..3a0267c16a 100644 --- a/server/datastore/mysql/migrations/tables/20231009094544_CreateTableQueryReports_test.go +++ b/server/datastore/mysql/migrations/tables/20231009094544_CreateTableQueryReports_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20231009094544(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // Apply current migration. diff --git a/server/datastore/mysql/migrations/tables/20231016091915_FixQueriesWithEmptyLoggingType_test.go b/server/datastore/mysql/migrations/tables/20231016091915_FixQueriesWithEmptyLoggingType_test.go index ce64a26b05..d261add9d4 100644 --- a/server/datastore/mysql/migrations/tables/20231016091915_FixQueriesWithEmptyLoggingType_test.go +++ b/server/datastore/mysql/migrations/tables/20231016091915_FixQueriesWithEmptyLoggingType_test.go @@ -8,6 +8,9 @@ import ( ) func TestUp_20231016091915(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) insertStmt := `INSERT INTO queries ( diff --git a/server/datastore/mysql/migrations/tables/20231024174135_RemoveQueryResultsForeignKey_test.go b/server/datastore/mysql/migrations/tables/20231024174135_RemoveQueryResultsForeignKey_test.go index 6468cc0f09..46122ccd25 100644 --- a/server/datastore/mysql/migrations/tables/20231024174135_RemoveQueryResultsForeignKey_test.go +++ b/server/datastore/mysql/migrations/tables/20231024174135_RemoveQueryResultsForeignKey_test.go @@ -9,6 +9,9 @@ import ( ) func TestUp_20231024174135(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) // diff --git a/server/datastore/mysql/migrations/tables/20231025120016_UniqueEmailInIdpAccounts_test.go b/server/datastore/mysql/migrations/tables/20231025120016_UniqueEmailInIdpAccounts_test.go index 069c0696c6..063be7a5fe 100644 --- a/server/datastore/mysql/migrations/tables/20231025120016_UniqueEmailInIdpAccounts_test.go +++ b/server/datastore/mysql/migrations/tables/20231025120016_UniqueEmailInIdpAccounts_test.go @@ -7,6 +7,9 @@ import ( ) func TestUp_20231025120016(t *testing.T) { + // skipping old migration tests as migrations don't change and we're getting + // timeouts in CI + t.Skip("old migration test, not longer required to run") db := applyUpToPrev(t) type idpAcc struct {