closes #8508

Merge branch 'wtsi-hgi-8508-datamanager-test-badpaths'

diff --combined services/datamanager/datamanager.go
index 4a3b5627ddfb664a440e1dbad8a4b2defdd16a9f,312bea07fd4bcceacdf8e1dd6a0ab9a6eec7bfa6..8e128358422a560a42cbdaa03e20feb8067fa6ba
--- 1/services/datamanager/datamanager.go
--- 2/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@@ -22,7 -22,6 +22,7 @@@ var 
        logEventTypePrefix  string
        logFrequencySeconds int
        minutesBetweenRuns  int
 +      collectionBatchSize int
        dryRun              bool
  )
  
@@@ -39,10 -38,6 +39,10 @@@ func init() 
                "minutes-between-runs",
                0,
                "How many minutes we wait between data manager runs. 0 means run once and exit.")
 +      flag.IntVar(&collectionBatchSize,
 +              "collection-batch-size",
 +              1000,
 +              "How many collections to request in each batch.")
        flag.BoolVar(&dryRun,
                "dry-run",
                false,
@@@ -198,7 -193,7 +198,7 @@@ func BuildDataFetcher(arv arvadosclient
                                collection.GetCollectionsParams{
                                        Client:    arv,
                                        Logger:    arvLogger,
 -                                      BatchSize: 50})
 +                                      BatchSize: collectionBatchSize})
                        collDone <- struct{}{}
                }()
  
@@@ -209,7 -204,7 +209,7 @@@
                                Logger: arvLogger,
                                Limit:  1000})
  
-               <- collDone
+               <-collDone
  
                // Return a nil error only if both parts succeeded.
                if collErr != nil {