investigate users not appearing in test assertions (#1188)

## Description

Some minor bugs.  Further assurance that users will appear
in the test results as expected will require manual curation
or addition of data in each user's account.

## Type of change

- [x] 🐛 Bugfix
- [x] 🤖 Test

## Issue(s)

* #902

## Test Plan

- [x] 💪 Manual
- [x] 💚 E2E
This commit is contained in:
Keepers 2022-10-19 13:39:00 -06:00 committed by GitHub
parent bc316df6d9
commit 2a51cc6975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,7 +22,7 @@ import (
"github.com/alcionai/corso/src/pkg/storage" "github.com/alcionai/corso/src/pkg/storage"
) )
var users = []string{ var alcUsers = []string{
"AdeleV@8qzvrj.onmicrosoft.com", "AdeleV@8qzvrj.onmicrosoft.com",
"AlexW@8qzvrj.onmicrosoft.com", "AlexW@8qzvrj.onmicrosoft.com",
"ashmarks@8qzvrj.onmicrosoft.com", "ashmarks@8qzvrj.onmicrosoft.com",
@ -226,14 +226,14 @@ func runRestoreLoadTest(
} }
// noFolders removes all "folder" category details entries // noFolders removes all "folder" category details entries
func noFolders(t *testing.T, des []details.DetailsEntry) []*details.DetailsEntry { func noFolders(t *testing.T, des []details.DetailsEntry) []details.DetailsEntry {
t.Helper() t.Helper()
sansfldr := []*details.DetailsEntry{} sansfldr := []details.DetailsEntry{}
for _, ent := range des { for _, ent := range des {
if ent.Folder == nil { if ent.Folder == nil {
sansfldr = append(sansfldr, &ent) sansfldr = append(sansfldr, ent)
} }
} }
@ -255,33 +255,30 @@ func ensureAllUsersInDetails(
) )
for _, u := range users { for _, u := range users {
foundUsers[u] = false
userCategories[u] = map[string]struct{}{} userCategories[u] = map[string]struct{}{}
} }
for _, ent := range noFolders(t, ds.Entries) { for _, ent := range noFolders(t, ds.Entries) {
p, err := path.FromDataLayerPath(ent.RepoRef, true) e := ent
if !assert.NoError(t, err, "converting to path: "+ent.RepoRef) { rr := e.RepoRef
p, err := path.FromDataLayerPath(rr, true)
if !assert.NoError(t, err, "converting to path: "+rr) {
continue continue
} }
ro := p.ResourceOwner() ro := p.ResourceOwner()
if !assert.NotEmpty(t, ro, "resource owner in path: "+ent.RepoRef) { if !assert.NotEmpty(t, ro, "resource owner in path: "+rr) {
continue continue
} }
ct := p.Category() ct := p.Category()
if !assert.NotEmpty(t, ro, "category type of path: "+ent.RepoRef) { if !assert.NotEmpty(t, ro, "category type of path: "+rr) {
continue continue
} }
foundUsers[ro] = true foundUsers[ro] = true
foundCategories[ct.String()] = struct{}{} foundCategories[ct.String()] = struct{}{}
if _, ok := userCategories[ro]; !ok {
userCategories[ro] = map[string]struct{}{}
}
userCategories[ro][ct.String()] = struct{}{} userCategories[ro][ct.String()] = struct{}{}
} }
@ -334,7 +331,7 @@ func (suite *RepositoryLoadTestExchangeSuite) TestExchange() {
t = suite.T() t = suite.T()
r = suite.repo r = suite.repo
service = "exchange" service = "exchange"
usersUnderTest = users usersUnderTest = alcUsers
all = selectors.Any() all = selectors.Any()
) )
@ -470,7 +467,7 @@ func (suite *RepositoryLoadTestOneDriveSuite) TestOneDrive() {
t = suite.T() t = suite.T()
r = suite.repo r = suite.repo
service = "one_drive" service = "one_drive"
usersUnderTest = users usersUnderTest = alcUsers
) )
// backup // backup