fix: make mock-agent.js test more resilient (nodejs#2780)

KhafraDev · Jun 24, 2024 · c6a1b9b · c6a1b9b
1 parent b4d84e2
commit c6a1b9b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/test/mock-agent.js b/test/mock-agent.js
@@ -775,13 +775,8 @@ test('MockAgent - handle delays to simulate work', async (t) => {
 
   const response = await getResponse(body)
   t.strictEqual(response, 'hello')
-<<<<<<< HEAD
   const elapsedInMs = Math.ceil(process.hrtime(start)[1] / 1e6)
   t.ok(elapsedInMs >= 50, `Elapsed time is not greater than 50ms: ${elapsedInMs}`)
-=======
-  const elapsedInMs = process.hrtime(start)[1] / 1e6
-  t.ok(elapsedInMs >= 49, `Elapsed time is not greater than 50ms: ${elapsedInMs}`)
->>>>>>> ddabe919... remove anti-pattern dispatcher hooks (#2723)
 })
 
 test('MockAgent - should persist requests', async (t) => {