Merge branch 'main' into recover-token-failure

alcionai · Nov 16, 2023 · 9695086 · 9695086
2 parents f0d9678 + cb4a8cb
commit 9695086
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/internal/m365/controller_test.go b/src/internal/m365/controller_test.go
@@ -1073,7 +1073,7 @@ func (suite *ControllerIntegrationSuite) TestRestoreAndBackup_core() {
 				suite.ctrl.tenant,
 				[]string{suite.user},
 				control.DefaultOptions(),
-				control.DefaultRestoreConfig(dttm.HumanReadableDriveItem))
+				control.DefaultRestoreConfig(dttm.SafeForTesting))
 		})
 	}
 }
@@ -1242,7 +1242,7 @@ func (suite *ControllerIntegrationSuite) TestMultiFolderBackupDifferentNames() {
 
 			t.Log("Backup enumeration complete")
 
-			restoreCfg := control.DefaultRestoreConfig(dttm.HumanReadableDriveItem)
+			restoreCfg := control.DefaultRestoreConfig(dttm.SafeForTesting)
 			restoreCfg.IncludePermissions = true
 
 			ci := stub.ConfigInfo{
@@ -1285,7 +1285,7 @@ func (suite *ControllerIntegrationSuite) TestRestoreAndBackup_largeMailAttachmen
 		},
 	}
 
-	restoreCfg := control.DefaultRestoreConfig(dttm.HumanReadableDriveItem)
+	restoreCfg := control.DefaultRestoreConfig(dttm.SafeForTesting)
 	restoreCfg.IncludePermissions = true
 
 	runRestoreBackupTest(

diff --git a/src/internal/m365/onedrive_test.go b/src/internal/m365/onedrive_test.go
@@ -1355,7 +1355,7 @@ func testRestoreFolderNamedFolderRegression(
 				collectionsLatest:   expected,
 			}
 
-			restoreCfg := control.DefaultRestoreConfig(dttm.HumanReadableDriveItem)
+			restoreCfg := control.DefaultRestoreConfig(dttm.SafeForTesting)
 			restoreCfg.IncludePermissions = true
 
 			runRestoreTestWithVersion(