From 963dd4a11dd991bea836e61b3b036e4008bb96c8 Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Thu, 18 Apr 2024 11:21:21 +0530 Subject: [PATCH] Disable conversations integ tests (#5299) `CorsoCITeam` group mailbox backup is currently broken because of invalid `odata.NextLink` which causes an infinite loop during paging. Disabling conv backups while we go fix the impacted group mailbox. --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [x] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [ ] :broom: Tech Debt/Cleanup #### Issue(s) * # #### Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- .github/workflows/sanity-test.yaml | 4 ++-- src/cli/backup/groups_e2e_test.go | 8 ++++++- .../test/m365/groups/groups_test.go | 24 ++++++++++++++----- .../m365/api/conversations_pager_test.go | 3 +++ 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sanity-test.yaml b/.github/workflows/sanity-test.yaml index da18b2228..1e8484c7b 100644 --- a/.github/workflows/sanity-test.yaml +++ b/.github/workflows/sanity-test.yaml @@ -483,7 +483,7 @@ jobs: with: service: groups kind: first-backup - backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}"' + backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}" --data messages,libraries' restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}' log-dir: ${{ env.CORSO_LOG_DIR }} with-export: true @@ -508,7 +508,7 @@ jobs: with: service: groups kind: incremental - backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}"' + backup-args: '--group "${{ vars.CORSO_M365_TEST_TEAM_ID }}" --data messages,libraries' restore-args: '--site "${{ vars.CORSO_M365_TEST_GROUPS_SITE_URL }}" --folder ${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}' restore-container: '${{ env.RESTORE_DEST_PFX }}${{ steps.new-data-creation-groups.outputs.result }}' log-dir: ${{ env.CORSO_LOG_DIR }} diff --git a/src/cli/backup/groups_e2e_test.go b/src/cli/backup/groups_e2e_test.go index 753807e3c..dbe5e9097 100644 --- a/src/cli/backup/groups_e2e_test.go +++ b/src/cli/backup/groups_e2e_test.go @@ -217,6 +217,9 @@ func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_badAzureClientIDFlag() } func (suite *BackupGroupsE2ESuite) TestBackupCreateGroups_fromConfigFile() { + // Skip + suite.T().Skip("CorsoCITeam group mailbox backup is broken") + t := suite.T() ctx, flush := tester.NewContext(t) ctx = config.SetViper(ctx, suite.dpnd.vpr) @@ -300,7 +303,10 @@ func (suite *PreparedBackupGroupsE2ESuite) SetupSuite() { ins = idname.NewCache(map[string]string{suite.m365.Group.ID: suite.m365.Group.ID}) cats = []path.CategoryType{ path.ChannelMessagesCategory, - path.ConversationPostsCategory, + // TODO(pandeyabs): CorsoCITeam group mailbox backup is currently broken because of invalid + // odata.NextLink which causes an infinite loop during paging. Disabling conversations tests while + // we go fix the group mailbox. + // path.ConversationPostsCategory, path.LibrariesCategory, } ) diff --git a/src/internal/operations/test/m365/groups/groups_test.go b/src/internal/operations/test/m365/groups/groups_test.go index a51aa70ef..5b841cce2 100644 --- a/src/internal/operations/test/m365/groups/groups_test.go +++ b/src/internal/operations/test/m365/groups/groups_test.go @@ -201,8 +201,12 @@ func (suite *GroupsBackupIntgSuite) TestBackup_Run_groupsBasic() { sel.Include( selTD.GroupsBackupLibraryFolderScope(sel), - selTD.GroupsBackupChannelScope(sel), - selTD.GroupsBackupConversationScope(sel)) + selTD.GroupsBackupChannelScope(sel)) + + // TODO(pandeyabs): CorsoCITeam group mailbox backup is currently broken because of invalid + // odata.NextLink which causes an infinite loop during paging. Disabling conversations tests while + // we go fix the group mailbox. + // selTD.GroupsBackupConversationScope(sel)) bo, bod := PrepNewTestBackupOp(t, ctx, mb, sel.Selector, opts, version.Backup, counter) defer bod.Close(t, ctx) @@ -326,8 +330,12 @@ func (suite *GroupsBackupNightlyIntgSuite) TestBackup_Run_groupsVersion9MergeBas sel := selectors.NewGroupsBackup([]string{suite.m365.Group.ID}) sel.Include( selTD.GroupsBackupLibraryFolderScope(sel), - selTD.GroupsBackupChannelScope(sel), - selTD.GroupsBackupConversationScope(sel)) + selTD.GroupsBackupChannelScope(sel)) + + // TODO(pandeyabs): CorsoCITeam group mailbox backup is currently broken because of invalid + // odata.NextLink which causes an infinite loop during paging. Disabling conv backups while + // we go fix the group mailbox. + // selTD.GroupsBackupConversationScope(sel)) RunMergeBaseGroupsUpdate(suite, sel.Selector, false) } @@ -336,8 +344,12 @@ func (suite *GroupsBackupNightlyIntgSuite) TestBackup_Run_groupsVersion9AssistBa sel := selectors.NewGroupsBackup([]string{suite.m365.Group.ID}) sel.Include( selTD.GroupsBackupLibraryFolderScope(sel), - selTD.GroupsBackupChannelScope(sel), - selTD.GroupsBackupConversationScope(sel)) + selTD.GroupsBackupChannelScope(sel)) + + // TODO(pandeyabs): CorsoCITeam group mailbox backup is currently broken because of invalid + // odata.NextLink which causes an infinite loop during paging. Disabling conv backups while + // we go fix the group mailbox. + // selTD.GroupsBackupConversationScope(sel)) RunDriveAssistBaseGroupsUpdate(suite, sel.Selector, false) } diff --git a/src/pkg/services/m365/api/conversations_pager_test.go b/src/pkg/services/m365/api/conversations_pager_test.go index d96ca1298..5ebd78752 100644 --- a/src/pkg/services/m365/api/conversations_pager_test.go +++ b/src/pkg/services/m365/api/conversations_pager_test.go @@ -32,6 +32,9 @@ func (suite *ConversationsPagerIntgSuite) SetupSuite() { } func (suite *ConversationsPagerIntgSuite) TestEnumerateConversations_withThreadsAndPosts() { + // Skip + suite.T().Skip("CorsoCITeam group mailbox backup is broken") + var ( t = suite.T() ac = suite.its.ac.Conversations()