fix messy rebase issues

This commit is contained in:
ryanfkeepers 2023-01-03 17:45:40 -07:00
parent a6e244e963
commit c895fca1e1

View File

@ -652,6 +652,9 @@ func (suite *BackupOpIntegrationSuite) TestBackup_Run_exchangeIncrementals() {
gc, err := connector.NewGraphConnector(ctx, acct, connector.Users) gc, err := connector.NewGraphConnector(ctx, acct, connector.Users)
require.NoError(t, err) require.NoError(t, err)
ac, err := api.NewClient(m365)
require.NoError(t, err)
// generate 3 new folders with two items each. // generate 3 new folders with two items each.
// Only the first two folders will be part of the initial backup and // Only the first two folders will be part of the initial backup and
// incrementals. The third folder will be introduced partway through // incrementals. The third folder will be introduced partway through
@ -900,7 +903,7 @@ func (suite *BackupOpIntegrationSuite) TestBackup_Run_exchangeIncrementals() {
switch category { switch category {
case path.EmailCategory: case path.EmailCategory:
ids, _, _, err := api.FetchMessageIDsFromDirectory(ctx, gc.Service, suite.user, folderID, "") ids, _, _, err := ac.FetchMessageIDsFromDirectory(ctx, suite.user, folderID, "")
require.NoError(t, err, "getting message ids") require.NoError(t, err, "getting message ids")
require.NotEmpty(t, ids, "message ids in folder") require.NotEmpty(t, ids, "message ids in folder")
@ -908,7 +911,7 @@ func (suite *BackupOpIntegrationSuite) TestBackup_Run_exchangeIncrementals() {
require.NoError(t, err, "deleting email item: %s", support.ConnectorStackErrorTrace(err)) require.NoError(t, err, "deleting email item: %s", support.ConnectorStackErrorTrace(err))
case path.ContactsCategory: case path.ContactsCategory:
ids, _, _, err := api.FetchContactIDsFromDirectory(ctx, gc.Service, suite.user, folderID, "") ids, _, _, err := ac.FetchContactIDsFromDirectory(ctx, suite.user, folderID, "")
require.NoError(t, err, "getting contact ids") require.NoError(t, err, "getting contact ids")
require.NotEmpty(t, ids, "contact ids in folder") require.NotEmpty(t, ids, "contact ids in folder")