larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failing nightly test

Browse Source
This commit is contained in:
Abin Simon 2023-10-17 17:14:53 +05:30
parent f64e2fe875
commit 9a647aa422
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/internal/m365/service/groups/restore.go
View File

@ -43,6 +43,10 @@ func GetRestoreResource(
}
if len(rc.ProtectedResource) == 0 {
if len(rc.SubService.ID) == 0 {
return path.UnknownService, nil, errors.New("missing subservice id for restore")
}
pr, err := res.GetResourceIDAndNameFrom(ctx, rc.SubService.ID, ins)
if err != nil {
return path.UnknownService, nil, clues.Wrap(err, "identifying resource owner")

2
src/internal/operations/test/group_test.go
View File

@ -239,5 +239,5 @@ func (suite *GroupsRestoreNightlyIntgSuite) TestRestore_Run_groupsAlternateProte
sel.Selector,
suite.its.group.RootSite,
suite.its.secondaryGroup.RootSite,
suite.its.secondaryGroup.ID)
suite.its.secondaryGroup.RootSite.ID)
}

13
src/internal/operations/test/onedrive_test.go
View File

@ -1050,6 +1050,12 @@ func runDriveRestoreWithAdvancedOptions(
acd = ac.Drives()
)
// Groups restore needs subservice information
if sel.Service == selectors.ServiceGroups {
restoreCfg.SubService.Type = path.SharePointService
restoreCfg.SubService.ID = driveID
}
// initial restore
suite.Run("baseline", func() {
@ -1320,8 +1326,13 @@ func runDriveRestoreToAlternateProtectedResource(
acd = ac.Drives()
)
// first restore to the 'from' resource
// Groups restore needs subservice information
if sel.Service == selectors.ServiceGroups {
restoreCfg.SubService.Type = path.SharePointService
restoreCfg.SubService.ID = driveFrom.ID
}
// first restore to the 'from' resource
suite.Run("restore original resource", func() {
mb = evmock.NewBus()
fromCtr := count.New()