Fix tests

artefactual-sdps · Dec 1, 2023 · 9ed1788 · 9ed1788
1 parent f992fba
commit 9ed1788
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/internal/sfa/activities/extract_package_test.go b/internal/sfa/activities/extract_package_test.go
@@ -34,12 +34,6 @@ func TestExtractPackage(t *testing.T) {
 			processingDir: fs.NewDir(t, ""),
 			wantErr:       "no entry found in extracted package directory",
 		},
-		{
-			name:          "Fails with multiple entries",
-			processingDir: fs.NewDir(t, "", fs.WithDir("folder1"), fs.WithDir("folder2")),
-			zipFolders:    []string{"folder1", "folder2"},
-			wantErr:       "more than one entry found in extracted package directory",
-		},
 	}
 	for _, tt := range tests {
 		tt := tt

diff --git a/internal/workflow/processing_test.go b/internal/workflow/processing_test.go
@@ -244,12 +244,12 @@ func (s *ProcessingWorkflowTestSuite) TestAMWorkflow() {
 	s.env.OnActivity(activities.BundleActivityName, mock.Anything, mock.Anything).Return(&activities.BundleActivityResult{FullPath: "/tmp/transfer", FullPathBeforeStrip: "/tmp/transfer"}, nil)
 
 	// SFA-preprocessing activities.
-	s.env.OnActivity(sfa_activities.ExtractPackageName, sessionCtx, &sfa_activities.ExtractPackageParams{}).Return(&sfa_activities.ExtractPackageResult{}, nil).Once()
+	s.env.OnActivity(sfa_activities.ExtractPackageName, sessionCtx, &sfa_activities.ExtractPackageParams{Key: "transfer.tgz"}).Return(&sfa_activities.ExtractPackageResult{}, nil).Once()
 	s.env.OnActivity(sfa_activities.CheckSipStructureName, sessionCtx, &sfa_activities.CheckSipStructureParams{}).Return(&sfa_activities.CheckSipStructureResult{Ok: true}, nil).Once()
 	s.env.OnActivity(sfa_activities.AllowedFileFormatsName, sessionCtx, &sfa_activities.AllowedFileFormatsParams{}).Return(&sfa_activities.AllowedFileFormatsResult{Ok: true}, nil).Once()
 	s.env.OnActivity(sfa_activities.MetadataValidationName, sessionCtx, &sfa_activities.MetadataValidationParams{}).Return(&sfa_activities.MetadataValidationResult{}, nil).Once()
 	s.env.OnActivity(sfa_activities.SipCreationName, sessionCtx, &sfa_activities.SipCreationParams{}).Return(&sfa_activities.SipCreationResult{}, nil).Once()
-	s.env.OnActivity(sfa_activities.SendToFailedBucketName, sessionCtx, &sfa_activities.SendToFailedBucketParams{}).Return(&sfa_activities.SendToFailedBucketResult{}, nil).Once().Maybe()
+	s.env.OnActivity(sfa_activities.SendToFailedBucketName, sessionCtx, &sfa_activities.SendToFailedBucketParams{}).Return(&sfa_activities.SendToFailedBucketResult{}, nil).Maybe()
 
 	// Archivematica specific activities.
 	s.env.OnActivity(activities.ZipActivityName,
@@ -269,7 +269,7 @@ func (s *ProcessingWorkflowTestSuite) TestAMWorkflow() {
 	).Return(&am.PollIngestActivityResult{Status: "COMPLETE"}, nil).Once()
 
 	// Post-preservation activities.
-	s.env.OnActivity(updatePackageLocalActivity, ctx, logger, pkgsvc, mock.AnythingOfType("*workflow.updatePackageLocalActivityParams")).Return(nil).Once()
+	s.env.OnActivity(updatePackageLocalActivity, ctx, logger, pkgsvc, mock.AnythingOfType("*workflow.updatePackageLocalActivityParams")).Return(nil).Times(2)
 	s.env.OnActivity(setStatusLocalActivity, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil).Never()
 	s.env.OnActivity(completePreservationActionLocalActivity, ctx, pkgsvc, mock.AnythingOfType("*workflow.completePreservationActionLocalActivityParams")).Return(nil).Once()
 	s.env.OnActivity(activities.CleanUpActivityName, sessionCtx, mock.AnythingOfType("*activities.CleanUpActivityParams")).Return(nil).Once()