Merge pull request #3238 from artilleryio/bernardobridge/fix-test-issue

test(cli): fix check for arm64 build
artilleryio · Jun 27, 2024 · a231b3e · a231b3e
2 parents 4cf8d05 + 7381908
commit a231b3e
Show file tree

Hide file tree

Showing 26 changed files with 56 additions and 38 deletions.
diff --git a/packages/artillery-engine-playwright/test/fargate.aws.js b/packages/artillery-engine-playwright/test/fargate.aws.js
@@ -1,6 +1,6 @@
 const { test, afterEach, beforeEach, before } = require('tap');
 const { $ } = require('zx');
-const { getTestTags } = require('../../artillery/test/cli/_helpers.js');
+const { getTestTags } = require('../../artillery/test/helpers');
 const fs = require('fs');
 
 const TEST_URL = 'https://www.artillery.io/';

diff --git a/packages/artillery/test/cli/async-hooks-esm.test.js b/packages/artillery/test/cli/async-hooks-esm.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute, generateTmpReportPath } = require('../cli/_helpers.js');
+const { execute, generateTmpReportPath } = require('../helpers');
 const fs = require('fs');
 
 let reportFilePath;

diff --git a/packages/artillery/test/cli/command-report.test.js b/packages/artillery/test/cli/command-report.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute, generateTmpReportPath } = require('../cli/_helpers.js');
+const { execute, generateTmpReportPath } = require('../helpers');
 
 tap.test('If we report specifying output, no browser is opened', async (t) => {
   const outputFilePath = generateTmpReportPath(t.name, 'html');

diff --git a/packages/artillery/test/cli/command-run.test.js b/packages/artillery/test/cli/command-run.test.js
@@ -5,7 +5,7 @@ const {
   getRootPath,
   returnTmpPath,
   generateTmpReportPath
-} = require('../cli/_helpers.js');
+} = require('../helpers');
 const fs = require('fs');
 const path = require('path');
 const execa = require('execa');

diff --git a/packages/artillery/test/cli/errors-and-warnings.test.js b/packages/artillery/test/cli/errors-and-warnings.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute } = require('../cli/_helpers.js');
+const { execute } = require('../helpers');
 const execa = require('execa');
 
 tap.test('GH #215 regression', async (t) => {

diff --git a/packages/artillery/test/cli/run-smoke.test.js b/packages/artillery/test/cli/run-smoke.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute } = require('../cli/_helpers.js');
+const { execute } = require('../helpers');
 
 tap.test(
   'Running with no arguments prints out usage information',

diff --git a/packages/artillery/test/cli/run-typescript.test.js b/packages/artillery/test/cli/run-typescript.test.js
@@ -1,9 +1,5 @@
 const tap = require('tap');
-const {
-  execute,
-  generateTmpReportPath,
-  deleteFile
-} = require('../cli/_helpers.js');
+const { execute, generateTmpReportPath, deleteFile } = require('../helpers');
 const fs = require('fs');
 const path = require('path');
 

diff --git a/packages/artillery/test/cli/suggested-exit-codes.test.js b/packages/artillery/test/cli/suggested-exit-codes.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute } = require('../cli/_helpers.js');
+const { execute } = require('../helpers');
 const path = require('path');
 
 tap.test('Workers should be able to set exit codes', async (t) => {

diff --git a/packages/artillery/test/cli/unknown-engine.test.js b/packages/artillery/test/cli/unknown-engine.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute } = require('../cli/_helpers.js');
+const { execute } = require('../helpers');
 
 tap.test(
   'Throws when encountered an unknown engine in scenarios',

diff --git a/packages/artillery/test/cli/variables-from-external-files.test.js b/packages/artillery/test/cli/variables-from-external-files.test.js
@@ -1,5 +1,5 @@
 const tap = require('tap');
-const { execute } = require('../cli/_helpers.js');
+const { execute } = require('../helpers');
 const execa = require('execa');
 
 /*

diff --git a/packages/artillery/test/cloud-e2e/fargate/bom.test.js b/packages/artillery/test/cloud-e2e/fargate/bom.test.js
@@ -1,10 +1,7 @@
 const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
 const fs = require('fs');
-const {
-  generateTmpReportPath,
-  getTestTags
-} = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/cw-adot.test.js
@@ -7,7 +7,7 @@ const {
   generateTmpReportPath,
   deleteFile,
   getTestTags
-} = require('../../cli/_helpers.js');
+} = require('../../helpers');
 const { getTestId, getXRayTraces } = require('./fixtures/adot/helpers.js');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';

diff --git a/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js b/packages/artillery/test/cloud-e2e/fargate/dd-adot.test.js
@@ -7,7 +7,7 @@ const {
   generateTmpReportPath,
   deleteFile,
   getTestTags
-} = require('../../cli/_helpers.js');
+} = require('../../helpers');
 
 const { getDatadogSpans, getTestId } = require('./fixtures/adot/helpers.js');
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/ensure-plugin.test.js b/packages/artillery/test/cloud-e2e/fargate/ensure-plugin.test.js
@@ -2,7 +2,7 @@ const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
 const chalk = require('chalk');
 const fs = require('fs');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/expect-plugin.test.js b/packages/artillery/test/cloud-e2e/fargate/expect-plugin.test.js
@@ -2,7 +2,7 @@ const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
 const chalk = require('chalk');
 const fs = require('fs');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/memory.test.js b/packages/artillery/test/cloud-e2e/fargate/memory.test.js
@@ -1,6 +1,6 @@
 const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/misc.test.js b/packages/artillery/test/cloud-e2e/fargate/misc.test.js
@@ -2,7 +2,7 @@ const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
 const chalk = require('chalk');
 const fs = require('fs');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/fargate/processors.test.js b/packages/artillery/test/cloud-e2e/fargate/processors.test.js
@@ -2,7 +2,7 @@ const { test, before, beforeEach } = require('tap');
 const { $ } = require('zx');
 const fs = require('fs');
 const path = require('path');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, getTestTags } = require('../../helpers');
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
 

diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-bom.test.js
@@ -1,12 +1,16 @@
 const tap = require('tap');
 const fs = require('fs');
 const { $ } = require('zx');
-const { getTestTags, generateTmpReportPath } = require('../../cli/_helpers.js');
+const {
+  getTestTags,
+  generateTmpReportPath,
+  getImageArchitecture
+} = require('../../helpers');
 
 const tags = getTestTags(['type:acceptance']);
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
-const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64';
+const ARCHITECTURE = getImageArchitecture();
 
 tap.before(async () => {
   await $`${A9_PATH} -V`;

diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-dotenv.test.js
@@ -1,11 +1,15 @@
 const tap = require('tap');
 const fs = require('fs');
 const { $ } = require('zx');
-const { getTestTags, generateTmpReportPath } = require('../../cli/_helpers.js');
+const {
+  getTestTags,
+  generateTmpReportPath,
+  getImageArchitecture
+} = require('../../helpers');
 
 const tags = getTestTags(['type:acceptance']);
 const A9_PATH = process.env.A9_PATH || 'artillery';
-const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64';
+const ARCHITECTURE = getImageArchitecture();
 
 tap.before(async () => {
   await $`${A9_PATH} -V`;

diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-ensure.test.js
@@ -2,7 +2,11 @@ const tap = require('tap');
 const { $ } = require('zx');
 const chalk = require('chalk');
 const fs = require('fs');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const {
+  generateTmpReportPath,
+  getTestTags,
+  getImageArchitecture
+} = require('../../helpers');
 
 //NOTE: all these tests report to Artillery Dashboard to dogfood and improve visibility
 const tags = getTestTags(['type:acceptance']);
@@ -13,7 +17,7 @@ tap.beforeEach(async (t) => {
 });
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
-const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64';
+const ARCHITECTURE = getImageArchitecture();
 
 tap.before(async () => {
   await $`${A9_PATH} -V`;

diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-expect.test.js
@@ -2,7 +2,11 @@ const tap = require('tap');
 const { $ } = require('zx');
 const chalk = require('chalk');
 const fs = require('fs');
-const { generateTmpReportPath, getTestTags } = require('../../cli/_helpers.js');
+const {
+  generateTmpReportPath,
+  getTestTags,
+  getImageArchitecture
+} = require('../../helpers');
 
 const tags = getTestTags(['type:acceptance']);
 let reportFilePath;
@@ -12,7 +16,7 @@ tap.beforeEach(async (t) => {
 });
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
-const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64';
+const ARCHITECTURE = getImageArchitecture();
 
 tap.before(async () => {
   await $`${A9_PATH} -V`;

diff --git a/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js b/packages/artillery/test/cloud-e2e/lambda/lambda-smoke.test.js
@@ -1,7 +1,11 @@
 const tap = require('tap');
 const fs = require('fs');
 const { $ } = require('zx');
-const { getTestTags, generateTmpReportPath } = require('../../cli/_helpers.js');
+const {
+  getTestTags,
+  generateTmpReportPath,
+  getImageArchitecture
+} = require('../../helpers');
 
 const tags = getTestTags(['type:acceptance']);
 
@@ -12,7 +16,7 @@ tap.beforeEach(async (t) => {
 });
 
 const A9_PATH = process.env.A9_PATH || 'artillery';
-const ARCHITECTURE = process.env.HAS_ARM64_BUILD ? 'arm64' : 'x86_64';
+const ARCHITECTURE = getImageArchitecture();
 
 tap.before(async () => {
   await $`${A9_PATH} -V`;

diff --git a/packages/artillery/test/cli/_helpers.js → packages/artillery/test/helpers/index.js b/packages/artillery/test/cli/_helpers.js → packages/artillery/test/helpers/index.js
@@ -47,11 +47,16 @@ function getTestTags(additionalTags) {
   return `${repoTag},${actorTag},${ciTag},${additionalTags.join(',')}`;
 }
 
+const getImageArchitecture = () => {
+  return process.env.HAS_ARM64_BUILD === 'true' ? 'arm64' : 'x86_64';
+};
+
 module.exports = {
   execute,
   deleteFile,
   getRootPath,
   returnTmpPath,
   generateTmpReportPath,
-  getTestTags
+  getTestTags,
+  getImageArchitecture
 };
diff --git a/packages/artillery/test/publish-metrics/tracing/http-trace.test.js b/packages/artillery/test/publish-metrics/tracing/http-trace.test.js
@@ -1,7 +1,7 @@
 const { test, afterEach, beforeEach } = require('tap');
 const { $ } = require('zx');
 const fs = require('fs');
-const { generateTmpReportPath, deleteFile } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, deleteFile } = require('../../helpers');
 
 const { setDynamicHTTPTraceExpectations } = require('../fixtures/helpers.js');
 

diff --git a/packages/artillery/test/publish-metrics/tracing/playwright-trace.test.js b/packages/artillery/test/publish-metrics/tracing/playwright-trace.test.js
@@ -1,7 +1,7 @@
 const { test, afterEach, beforeEach } = require('tap');
 const { $ } = require('zx');
 const fs = require('fs');
-const { generateTmpReportPath, deleteFile } = require('../../cli/_helpers.js');
+const { generateTmpReportPath, deleteFile } = require('../../helpers');
 
 const {
   setDynamicPlaywrightTraceExpectations