refactor(test): move getTesId helper to artillery test helpers

artilleryio · Jul 18, 2024 · df0d19f · df0d19f
1 parent 92293f0
commit df0d19f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js
@@ -6,9 +6,10 @@ const fs = require('fs');
 const {
   generateTmpReportPath,
   deleteFile,
-  getTestTags
+  getTestTags,
+  getTestId
 } = require('../../helpers');
-const { getTestId, getXRayTraces } = require('./fixtures/adot/helpers.js');
+const { getXRayTraces } = require('./fixtures/adot/helpers.js');
 const {
   checkForNegativeValues,
   checkAggregateCounterSums

diff --git a/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js
@@ -6,13 +6,14 @@ const fs = require('fs');
 const {
   generateTmpReportPath,
   deleteFile,
-  getTestTags
+  getTestTags,
+  getTestId
 } = require('../../helpers');
 const {
   checkForNegativeValues,
   checkAggregateCounterSums
 } = require('../../helpers/expectations');
-const { getDatadogSpans, getTestId } = require('./fixtures/adot/helpers.js');
+const { getDatadogSpans } = require('./fixtures/adot/helpers.js');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 //NOTE: This test reports to Artillery Dashboard to dogfood and improve visibility

diff --git a/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js b/packages/artillery/test/cloud-e2e/fargate/fixtures/adot/helpers.js
@@ -6,17 +6,10 @@ const AWS = require('aws-sdk');
 const xray = new AWS.XRay({ region: 'us-east-1' });
 
 module.exports = {
-  getTestId,
   getDatadogSpans,
   getXRayTraces
 };
 
-function getTestId(outputString) {
-  const regex = /Test run ID: \S+/;
-  const match = outputString.match(regex);
-  return match[0].replace('Test run ID: ', '');
-}
-
 async function getDatadogSpans(apiKey, appKey, testId, expectedTotalSpans) {
   const url = 'https://api.datadoghq.com/api/v2/spans/events/search';
   const headers = {

diff --git a/packages/artillery/test/helpers/index.js b/packages/artillery/test/helpers/index.js
@@ -51,12 +51,19 @@ const getImageArchitecture = () => {
   return process.env.HAS_ARM64_BUILD === 'true' ? 'arm64' : 'x86_64';
 };
 
+function getTestId(outputString) {
+  const regex = /Test run ID: \S+/i;
+  const match = outputString.match(regex);
+  return match[0].replace('Test run ID: ', '');
+}
+
 module.exports = {
   execute,
   deleteFile,
   getRootPath,
   returnTmpPath,
   generateTmpReportPath,
   getTestTags,
-  getImageArchitecture
+  getImageArchitecture,
+  getTestId
 };