Merge pull request #92 from qtomlinson/qt/use_new_policy

Use the new traversal policy to simplify reharvest

tools/integration/lib/harvester.js

@@ -20,7 +20,7 @@ class Harvester {
     const tool = this._harvestToolChecks?.length === 1 ? this._harvestToolChecks[0][0] : 'component'
     return components.map(coordinates => {
       const result = { tool, coordinates }
-      if (reharvest) result.policy = 'always'
+      if (reharvest) result.policy = 'reharvestAlways'
       return result
     })
   }
@@ -57,10 +57,6 @@ class Harvester {
     if (!component) throw new Error('Component not set')
     console.log('Start to detect schema versions for harvest tools')
     const startTime = Date.now()
-    //make sure that we have one entire set of harvest results (old or new)
-    await this.harvest([component])
-    await new Promise(resolve => setTimeout(resolve, poller.interval))
-
     //trigger a reharvest to overwrite the old result, so we can verify the timestamp is new for completion
     await this.harvest([component], true)
 

tools/integration/test/integration/harvestTest.js

@@ -28,18 +28,9 @@ async function harvestTillCompletion(components) {
   const versionPoller = new Poller(poll.interval / 5, poll.maxTime)
   await harvester.detectSchemaVersions(oneComponent, versionPoller, tools)
 
-  //make sure that we have one entire set of harvest results (old or new)
-  console.log('Ensure harvest results exist before starting tests')
-  const previousHarvests = await harvester.pollForCompletion(components, new Poller(1, 1))
-  const previousHarvestsComplete = Array.from(previousHarvests.values()).every(v => v)
-  const poller = new Poller(poll.interval, poll.maxTime)
-  if (!previousHarvestsComplete) {
-    await harvester.harvest(components)
-    await harvester.pollForCompletion(components, poller)
-  }
-
   //trigger a reharvest to overwrite the old result
   console.log('Trigger reharvest to overwrite old results')
   await harvester.harvest(components, true)
+  const poller = new Poller(poll.interval, poll.maxTime)
   return harvester.pollForCompletion(components, poller, Date.now())
 }