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

rebase fixes

Browse Source
This commit is contained in:
ryanfkeepers 2023-03-29 14:51:39 -06:00
parent b5527e9ef2
commit 3da8bf86a4
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/connector/graph_connector_disconnected_test.go
View File

@ -111,16 +111,16 @@ func (suite *DisconnectedGraphConnectorSuite) TestGraphConnector_Status() {
go statusTestTask(&gc, 4, 1, 1) go statusTestTask(&gc, 4, 1, 1)
go statusTestTask(&gc, 4, 1, 1) go statusTestTask(&gc, 4, 1, 1)
status := gc.Wait() stats := gc.Wait()
t := suite.T() t := suite.T()
assert.NotEmpty(t, gc.PrintableStatus()) assert.NotEmpty(t, gc.PrintableStatus())
// Expect 8 objects // Expect 8 objects
assert.Equal(t, 8, status.Metrics.Objects) assert.Equal(t, 8, stats.Objects)
// Expect 2 success // Expect 2 success
assert.Equal(t, 2, status.Metrics.Successes) assert.Equal(t, 2, stats.Successes)
// Expect 2 folders // Expect 2 folders
assert.Equal(t, 2, status.Folders) assert.Equal(t, 2, stats.Folders)
} }
func (suite *DisconnectedGraphConnectorSuite) TestVerifyBackupInputs_allServices() { func (suite *DisconnectedGraphConnectorSuite) TestVerifyBackupInputs_allServices() {

16
src/internal/connector/graph_connector_test.go
View File

@ -135,7 +135,7 @@ func (suite *GraphConnectorUnitSuite) TestUnionSiteIDsAndWebURLs() {
} }
} }
func (suite *GraphConnectorUnitSuite) TestGraphConnector_AwaitStatus() { func (suite *GraphConnectorUnitSuite) TestGraphConnector_Wait() {
ctx, flush := tester.NewContext() ctx, flush := tester.NewContext()
defer flush() defer flush()
@ -156,14 +156,14 @@ func (suite *GraphConnectorUnitSuite) TestGraphConnector_AwaitStatus() {
gc.wg.Add(1) gc.wg.Add(1)
gc.UpdateStatus(status) gc.UpdateStatus(status)
result := gc.AwaitStatus() result := gc.Wait()
require.NotNil(t, result) require.NotNil(t, result)
assert.Nil(t, gc.region, "region") assert.Nil(t, gc.region, "region")
assert.Empty(t, gc.status, "status") assert.Empty(t, gc.status, "status")
assert.Equal(t, 1, result.Folders) assert.Equal(t, 1, result.Folders)
assert.Equal(t, 2, result.Metrics.Objects) assert.Equal(t, 2, result.Objects)
assert.Equal(t, 3, result.Metrics.Successes) assert.Equal(t, 3, result.Successes)
assert.Equal(t, int64(4), result.Metrics.Bytes) assert.Equal(t, int64(4), result.Bytes)
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -1151,8 +1151,10 @@ func (suite *GraphConnectorIntegrationSuite) TestBackup_CreatesPrefixCollections
start = time.Now() start = time.Now()
) )
dcs, excludes, err := backupGC.DataCollections( dcs, excludes, err := backupGC.ProduceBackupCollections(
ctx, ctx,
backupSel.DiscreteOwner,
backupSel.DiscreteOwner,
backupSel, backupSel,
nil, nil,
control.Options{ control.Options{
@ -1195,7 +1197,7 @@ func (suite *GraphConnectorIntegrationSuite) TestBackup_CreatesPrefixCollections
assert.ElementsMatch(t, test.categories, foundCategories) assert.ElementsMatch(t, test.categories, foundCategories)
backupGC.AwaitStatus() backupGC.Wait()
assert.NoError(t, errs.Failure()) assert.NoError(t, errs.Failure())
}) })

2
src/internal/operations/backup.go
View File

@ -92,7 +92,7 @@ func (op BackupOperation) validate() error {
} }
if op.bp == nil { if op.bp == nil {
return errors.New("missing backup producer") return clues.New("missing backup producer")
} }
return op.operation.validate() return op.operation.validate()

4
src/internal/operations/backup_integration_test.go
View File

@ -394,7 +394,9 @@ func generateContainerOfItems(
fault.New(true)) fault.New(true))
require.NoError(t, err, clues.ToCore(err)) require.NoError(t, err, clues.ToCore(err))
gc.AwaitStatus() // have to wait here, both to ensure the process
// finishes, and also to clean up the gc status
gc.Wait()
return deets return deets
} }