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

skip tests that restore contacts, events (#885)

Browse Source 
## Description

Skips any integration tests that restore events or contacts.

## Type of change

- [x] 🤖 Test

## Issue(s)

* #884

## Test Plan

- [x] 💚 E2E
This commit is contained in:
Keepers 2022-09-16 15:33:57 -06:00 committed by GitHub
parent 275961b5bd
commit 609bbc3512
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/restore/exchange_integration_test.go
View File

@ -31,7 +31,7 @@ var (
// dataset to grow until timeouts occur. // dataset to grow until timeouts occur.
// var backupDataSets = []path.CategoryType{email, contacts, events} // var backupDataSets = []path.CategoryType{email, contacts, events}
var backupDataSets = []path.CategoryType{email, contacts} var backupDataSets = []path.CategoryType{email}
type RestoreExchangeIntegrationSuite struct { type RestoreExchangeIntegrationSuite struct {
suite.Suite suite.Suite

80
src/internal/connector/exchange/exchange_service_test.go
View File

@ -398,6 +398,8 @@ func (suite *ExchangeServiceSuite) TestRestoreMessages() {
// the Corso Folder. The function handles test clean-up. // the Corso Folder. The function handles test clean-up.
func (suite *ExchangeServiceSuite) TestRestoreContact() { func (suite *ExchangeServiceSuite) TestRestoreContact() {
t := suite.T() t := suite.T()
// TODO: #884 - reinstate when able to specify root folder by name
t.Skip("#884 - reinstate when able to specify root folder by name")
userID := tester.M365UserID(t) userID := tester.M365UserID(t)
now := time.Now() now := time.Now()
@ -422,6 +424,8 @@ func (suite *ExchangeServiceSuite) TestRestoreContact() {
// and sent into the test account of the Corso user in the newly created Corso Calendar // and sent into the test account of the Corso user in the newly created Corso Calendar
func (suite *ExchangeServiceSuite) TestRestoreEvent() { func (suite *ExchangeServiceSuite) TestRestoreEvent() {
t := suite.T() t := suite.T()
// TODO: #884 - reinstate when able to specify root folder by name
t.Skip("#884 - reinstate when able to specify root folder by name")
userID := tester.M365UserID(t) userID := tester.M365UserID(t)
name := "TestRestoreEvent: " + common.FormatSimpleDateTime(time.Now()) name := "TestRestoreEvent: " + common.FormatSimpleDateTime(time.Now())
calendar, err := CreateCalendar(suite.es, userID, name) calendar, err := CreateCalendar(suite.es, userID, name)
@ -456,12 +460,14 @@ func (suite *ExchangeServiceSuite) TestGetRestoreContainer() {
checkError: assert.Error, checkError: assert.Error,
cleanupFunc: nil, cleanupFunc: nil,
}, },
{
name: "Establish Event Restore Location", // TODO: #884 - reinstate when able to specify root folder by name
option: path.EventsCategory, // {
checkError: assert.NoError, // name: "Establish Event Restore Location",
cleanupFunc: DeleteCalendar, // option: path.EventsCategory,
}, // checkError: assert.NoError,
// cleanupFunc: DeleteCalendar,
// },
{ {
name: "Establish Restore Folder for Unknown", name: "Establish Restore Folder for Unknown",
option: path.UnknownCategory, option: path.UnknownCategory,
@ -474,12 +480,13 @@ func (suite *ExchangeServiceSuite) TestGetRestoreContainer() {
checkError: assert.NoError, checkError: assert.NoError,
cleanupFunc: DeleteMailFolder, cleanupFunc: DeleteMailFolder,
}, },
{ // TODO: #884 - reinstate when able to specify root folder by name
name: "Establish Restore folder for Contacts", // {
option: path.ContactsCategory, // name: "Establish Restore folder for Contacts",
checkError: assert.NoError, // option: path.ContactsCategory,
cleanupFunc: DeleteContactFolder, // checkError: assert.NoError,
}, // cleanupFunc: DeleteContactFolder,
// },
} }
userID := tester.M365UserID(suite.T()) userID := tester.M365UserID(suite.T())
@ -524,32 +531,33 @@ func (suite *ExchangeServiceSuite) TestRestoreExchangeObject() {
return *folder.GetId() return *folder.GetId()
}, },
}, },
{ // TODO: #884 - reinstate when able to specify root folder by name
name: "Test Contact", // {
bytes: mockconnector.GetMockContactBytes("Test_Omega"), // name: "Test Contact",
category: path.ContactsCategory, // bytes: mockconnector.GetMockContactBytes("Test_Omega"),
cleanupFunc: DeleteContactFolder, // category: path.ContactsCategory,
destination: func() string { // cleanupFunc: DeleteContactFolder,
folderName := "TestRestoreContactObject: " + common.FormatSimpleDateTime(now) // destination: func() string {
folder, err := CreateContactFolder(suite.es, userID, folderName) // folderName := "TestRestoreContactObject: " + common.FormatSimpleDateTime(now)
require.NoError(t, err) // folder, err := CreateContactFolder(suite.es, userID, folderName)
// require.NoError(t, err)
return *folder.GetId() // return *folder.GetId()
}, // },
}, // },
{ // {
name: "Test Events", // name: "Test Events",
bytes: mockconnector.GetMockEventBytes("Restored Event Object"), // bytes: mockconnector.GetMockEventBytes("Restored Event Object"),
category: path.EventsCategory, // category: path.EventsCategory,
cleanupFunc: DeleteCalendar, // cleanupFunc: DeleteCalendar,
destination: func() string { // destination: func() string {
calendarName := "TestRestoreEventObject: " + common.FormatSimpleDateTime(now) // calendarName := "TestRestoreEventObject: " + common.FormatSimpleDateTime(now)
calendar, err := CreateCalendar(suite.es, userID, calendarName) // calendar, err := CreateCalendar(suite.es, userID, calendarName)
require.NoError(t, err) // require.NoError(t, err)
return *calendar.GetId() // return *calendar.GetId()
}, // },
}, // },
} }
for _, test := range tests { for _, test := range tests {