minro cleanup on duplicated load test code (#1333)
## Type of change - [x] 🐹 Trivial/Minor ## Issue(s) * #902 ## Test Plan - [x] 💚 E2E
This commit is contained in:
parent
ae6376cf30
commit
efd697f522
@ -10,7 +10,6 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
"github.com/stretchr/testify/suite"
|
"github.com/stretchr/testify/suite"
|
||||||
|
|
||||||
"github.com/alcionai/corso/src/internal/connector/exchange"
|
|
||||||
"github.com/alcionai/corso/src/internal/operations"
|
"github.com/alcionai/corso/src/internal/operations"
|
||||||
"github.com/alcionai/corso/src/internal/tester"
|
"github.com/alcionai/corso/src/internal/tester"
|
||||||
"github.com/alcionai/corso/src/pkg/account"
|
"github.com/alcionai/corso/src/pkg/account"
|
||||||
@ -84,6 +83,35 @@ func initM365Repo(t *testing.T) (
|
|||||||
// Common
|
// Common
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//revive:disable:context-as-argument
|
||||||
|
func runLoadTest(
|
||||||
|
t *testing.T,
|
||||||
|
ctx context.Context,
|
||||||
|
r repository.Repository,
|
||||||
|
service string,
|
||||||
|
usersUnderTest []string,
|
||||||
|
bupSel, restSel selectors.Selector,
|
||||||
|
) {
|
||||||
|
//revive:enable:context-as-argument
|
||||||
|
t.Run("load_test_main", func(t *testing.T) {
|
||||||
|
b, err := r.NewBackup(ctx, bupSel)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
runBackupLoadTest(t, ctx, &b, service, usersUnderTest)
|
||||||
|
bid := string(b.Results.BackupID)
|
||||||
|
|
||||||
|
runBackupListLoadTest(t, ctx, r, service, bid)
|
||||||
|
runBackupDetailsLoadTest(t, ctx, r, service, bid, usersUnderTest)
|
||||||
|
|
||||||
|
dest := tester.DefaultTestRestoreDestination()
|
||||||
|
|
||||||
|
rst, err := r.NewRestore(ctx, bid, restSel, dest)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
runRestoreLoadTest(t, ctx, rst, service, b.Results.ItemsWritten, usersUnderTest)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
//revive:disable:context-as-argument
|
//revive:disable:context-as-argument
|
||||||
func runBackupLoadTest(
|
func runBackupLoadTest(
|
||||||
t *testing.T,
|
t *testing.T,
|
||||||
@ -345,39 +373,22 @@ func (suite *RepositoryLoadTestExchangeSuite) TestExchange() {
|
|||||||
ctx, flush := tester.NewContext()
|
ctx, flush := tester.NewContext()
|
||||||
defer flush()
|
defer flush()
|
||||||
|
|
||||||
var (
|
usersUnderTest := alcUsers
|
||||||
t = suite.T()
|
|
||||||
r = suite.repo
|
|
||||||
service = "exchange"
|
|
||||||
usersUnderTest = alcUsers
|
|
||||||
all = selectors.Any()
|
|
||||||
)
|
|
||||||
|
|
||||||
// backup
|
|
||||||
bsel := selectors.NewExchangeBackup()
|
bsel := selectors.NewExchangeBackup()
|
||||||
bsel.Include(bsel.MailFolders(usersUnderTest, all))
|
bsel.Include(bsel.MailFolders(usersUnderTest, selectors.Any()))
|
||||||
bsel.Include(bsel.ContactFolders(usersUnderTest, all))
|
bsel.Include(bsel.ContactFolders(usersUnderTest, selectors.Any()))
|
||||||
bsel.Include(bsel.EventCalendars(usersUnderTest, all))
|
bsel.Include(bsel.EventCalendars(usersUnderTest, selectors.Any()))
|
||||||
|
sel := bsel.Selector
|
||||||
|
|
||||||
b, err := r.NewBackup(ctx, bsel.Selector)
|
runLoadTest(
|
||||||
require.NoError(t, err)
|
suite.T(),
|
||||||
|
ctx,
|
||||||
runBackupLoadTest(t, ctx, &b, service, usersUnderTest)
|
suite.repo,
|
||||||
bid := string(b.Results.BackupID)
|
"exchange",
|
||||||
|
usersUnderTest,
|
||||||
runBackupListLoadTest(t, ctx, r, service, bid)
|
sel, sel, // same selection for backup and restore
|
||||||
runBackupDetailsLoadTest(t, ctx, r, service, bid, usersUnderTest)
|
)
|
||||||
|
|
||||||
// restore
|
|
||||||
rsel, err := bsel.ToExchangeRestore()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
dest := tester.DefaultTestRestoreDestination()
|
|
||||||
|
|
||||||
rst, err := r.NewRestore(ctx, bid, rsel.Selector, dest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
runRestoreLoadTest(t, ctx, rst, service, b.Results.ItemsWritten, usersUnderTest)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// single user, lots of data
|
// single user, lots of data
|
||||||
@ -412,38 +423,22 @@ func (suite *RepositoryIndividualLoadTestExchangeSuite) TestExchange() {
|
|||||||
ctx, flush := tester.NewContext()
|
ctx, flush := tester.NewContext()
|
||||||
defer flush()
|
defer flush()
|
||||||
|
|
||||||
var (
|
usersUnderTest := largeDatasetUser
|
||||||
t = suite.T()
|
|
||||||
r = suite.repo
|
|
||||||
service = "exchange"
|
|
||||||
usersUnderTest = largeDatasetUser
|
|
||||||
)
|
|
||||||
|
|
||||||
// backup
|
|
||||||
bsel := selectors.NewExchangeBackup()
|
bsel := selectors.NewExchangeBackup()
|
||||||
bsel.Include(bsel.MailFolders(usersUnderTest, []string{exchange.DefaultMailFolder}))
|
bsel.Include(bsel.MailFolders(usersUnderTest, selectors.Any()))
|
||||||
bsel.Include(bsel.ContactFolders(usersUnderTest, []string{exchange.DefaultContactFolder}))
|
bsel.Include(bsel.ContactFolders(usersUnderTest, selectors.Any()))
|
||||||
bsel.Include(bsel.EventCalendars(usersUnderTest, []string{exchange.DefaultCalendar}))
|
bsel.Include(bsel.EventCalendars(usersUnderTest, selectors.Any()))
|
||||||
|
sel := bsel.Selector
|
||||||
|
|
||||||
b, err := r.NewBackup(ctx, bsel.Selector)
|
runLoadTest(
|
||||||
require.NoError(t, err)
|
suite.T(),
|
||||||
|
ctx,
|
||||||
runBackupLoadTest(t, ctx, &b, service, usersUnderTest)
|
suite.repo,
|
||||||
bid := string(b.Results.BackupID)
|
"exchange",
|
||||||
|
usersUnderTest,
|
||||||
runBackupListLoadTest(t, ctx, r, service, bid)
|
sel, sel, // same selection for backup and restore
|
||||||
runBackupDetailsLoadTest(t, ctx, r, service, bid, usersUnderTest)
|
)
|
||||||
|
|
||||||
// restore
|
|
||||||
rsel, err := bsel.ToExchangeRestore()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
dest := tester.DefaultTestRestoreDestination()
|
|
||||||
|
|
||||||
rst, err := r.NewRestore(ctx, bid, rsel.Selector, dest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
runRestoreLoadTest(t, ctx, rst, service, b.Results.ItemsWritten, usersUnderTest)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
@ -481,36 +476,20 @@ func (suite *RepositoryLoadTestOneDriveSuite) TestOneDrive() {
|
|||||||
ctx, flush := tester.NewContext()
|
ctx, flush := tester.NewContext()
|
||||||
defer flush()
|
defer flush()
|
||||||
|
|
||||||
var (
|
usersUnderTest := alcUsers
|
||||||
t = suite.T()
|
|
||||||
r = suite.repo
|
|
||||||
service = "one_drive"
|
|
||||||
usersUnderTest = alcUsers
|
|
||||||
)
|
|
||||||
|
|
||||||
// backup
|
|
||||||
bsel := selectors.NewOneDriveBackup()
|
bsel := selectors.NewOneDriveBackup()
|
||||||
bsel.Include(bsel.Users(usersUnderTest))
|
bsel.Include(bsel.Users(usersUnderTest))
|
||||||
|
sel := bsel.Selector
|
||||||
|
|
||||||
b, err := r.NewBackup(ctx, bsel.Selector)
|
runLoadTest(
|
||||||
require.NoError(t, err)
|
suite.T(),
|
||||||
|
ctx,
|
||||||
runBackupLoadTest(t, ctx, &b, service, usersUnderTest)
|
suite.repo,
|
||||||
bid := string(b.Results.BackupID)
|
"one_drive",
|
||||||
|
usersUnderTest,
|
||||||
runBackupListLoadTest(t, ctx, r, service, bid)
|
sel, sel, // same selection for backup and restore
|
||||||
runBackupDetailsLoadTest(t, ctx, r, service, bid, usersUnderTest)
|
)
|
||||||
|
|
||||||
// restore
|
|
||||||
rsel, err := bsel.ToOneDriveRestore()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
dest := tester.DefaultTestRestoreDestination()
|
|
||||||
|
|
||||||
rst, err := r.NewRestore(ctx, bid, rsel.Selector, dest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
runRestoreLoadTest(t, ctx, rst, service, b.Results.ItemsWritten, usersUnderTest)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type RepositoryIndividualLoadTestOneDriveSuite struct {
|
type RepositoryIndividualLoadTestOneDriveSuite struct {
|
||||||
@ -544,34 +523,18 @@ func (suite *RepositoryIndividualLoadTestOneDriveSuite) TestOneDrive() {
|
|||||||
ctx, flush := tester.NewContext()
|
ctx, flush := tester.NewContext()
|
||||||
defer flush()
|
defer flush()
|
||||||
|
|
||||||
var (
|
usersUnderTest := largeDatasetUser
|
||||||
t = suite.T()
|
|
||||||
r = suite.repo
|
|
||||||
service = "one_drive"
|
|
||||||
usersUnderTest = largeDatasetUser
|
|
||||||
)
|
|
||||||
|
|
||||||
// backup
|
|
||||||
bsel := selectors.NewOneDriveBackup()
|
bsel := selectors.NewOneDriveBackup()
|
||||||
bsel.Include(bsel.Users(usersUnderTest))
|
bsel.Include(bsel.Users(usersUnderTest))
|
||||||
|
sel := bsel.Selector
|
||||||
|
|
||||||
b, err := r.NewBackup(ctx, bsel.Selector)
|
runLoadTest(
|
||||||
require.NoError(t, err)
|
suite.T(),
|
||||||
|
ctx,
|
||||||
runBackupLoadTest(t, ctx, &b, service, usersUnderTest)
|
suite.repo,
|
||||||
bid := string(b.Results.BackupID)
|
"one_drive",
|
||||||
|
usersUnderTest,
|
||||||
runBackupListLoadTest(t, ctx, r, service, bid)
|
sel, sel, // same selection for backup and restore
|
||||||
runBackupDetailsLoadTest(t, ctx, r, service, bid, usersUnderTest)
|
)
|
||||||
|
|
||||||
// restore
|
|
||||||
rsel, err := bsel.ToOneDriveRestore()
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
dest := tester.DefaultTestRestoreDestination()
|
|
||||||
|
|
||||||
rst, err := r.NewRestore(ctx, bid, rsel.Selector, dest)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
runRestoreLoadTest(t, ctx, rst, service, b.Results.ItemsWritten, usersUnderTest)
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user