Fix tests (#152)

* Removed unneeded vars * Added mock restore * Fixed grouping of tests into describe * Added AGENT_APPLICATION_NAME similar to the controller name * Removed unneeded comment
FamilySearch · Sep 29, 2023 · aeeccd5 · aeeccd5
1 parent fe719b0
commit aeeccd5
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 50 deletions.
diff --git a/agent/createtest/createtest.yaml b/agent/createtest/createtest.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   serviceUrlAgent: ${SERVICE_URL_AGENT}
 load_pattern:
   - linear:

diff --git a/agent/createtest/shorter/createtest.yaml b/agent/createtest/shorter/createtest.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   serviceUrlAgent: ${SERVICE_URL_AGENT}
 load_pattern:
   - linear:

diff --git a/common/src/util/s3.ts b/common/src/util/s3.ts
@@ -72,7 +72,6 @@ export function init (): void {
   // Where <prefix> is your application name, system name, and service name concatenated with underscores, capitalized, and all dashes replaced with underscores.
   // The s3 service name is s3 in the application which is then capitalized to _S3_ below
 
-  // We need to error check if we're running on application we don't fall back to the unittests on live
   const PREFIX: string = getPrefix(true); // Use the controller if we have one
   const bucketName: string | undefined = process.env[`${PREFIX}_S3_BUCKET_NAME`];
   log(`${PREFIX}_S3_BUCKET_NAME = ${bucketName}`, LogLevel.DEBUG);

diff --git a/common/src/util/sqs.ts b/common/src/util/sqs.ts
@@ -1,4 +1,9 @@
-import { AGENT_ENV, SYSTEM_NAME, getPrefix } from "./util";
+import {
+  AGENT_APPLICATION_NAME,
+  AGENT_ENV,
+  SYSTEM_NAME,
+  getPrefix
+} from "./util";
 import {
   ChangeMessageVisibilityCommand,
   ChangeMessageVisibilityCommandInput,
@@ -43,7 +48,7 @@ export function init () {
       // Controller should have this env variable from the deployment
       const systemNames: string[] = AGENT_ENV.split(",");
       for (const systemName of systemNames) {
-        const PREFIX: string = "PEWPEWAGENT_" + systemName.toUpperCase().replace("-", "_");
+        const PREFIX: string = (AGENT_APPLICATION_NAME + "_" + systemName).toUpperCase().replace("-", "_");
         const queueUrlTest: string | undefined = process.env[`${PREFIX}_SQS_SCALE_OUT_QUEUE_URL`];
         log(`${PREFIX}_SQS_SCALE_OUT_QUEUE_URL = ${queueUrlTest}`, LogLevel.DEBUG);
         if (!queueUrlTest) {
@@ -72,7 +77,7 @@ export function init () {
       // Controller should have this env variable from the deployment
       const systemNames: string[] = AGENT_ENV.split(",");
       for (const systemName of systemNames) {
-        const PREFIX: string = "PEWPEWAGENT_" + systemName.toUpperCase().replace("-", "_");
+        const PREFIX: string = (AGENT_APPLICATION_NAME + "_" + systemName).toUpperCase().replace("-", "_");
         const queueUrlTest: string | undefined = process.env[`${PREFIX}_SQS_SCALE_IN_QUEUE_URL`];
         log(`${PREFIX}_SQS_SCALE_IN_QUEUE_URL = ${queueUrlTest}`, LogLevel.DEBUG);
         if (!queueUrlTest) {

diff --git a/common/src/util/util.ts b/common/src/util/util.ts
@@ -4,6 +4,7 @@ import { LogLevel, log } from "./log";
 
 export const APPLICATION_NAME: string = process.env.APPLICATION_NAME || "pewpewagent";
 export const CONTROLLER_APPLICATION_NAME: string = process.env.CONTROLLER_APPLICATION_NAME || "pewpewcontroller";
+export const AGENT_APPLICATION_NAME: string = process.env.AGENT_APPLICATION_NAME || "pewpewagent";
 export const CONTROLLER_APPLICATION_PREFIX: string = CONTROLLER_APPLICATION_NAME.toUpperCase().replace(/-/g, "_") + "_";
 export const SYSTEM_NAME: string = process.env.SYSTEM_NAME || "unittests";
 export const CONTROLLER_ENV = process.env.CONTROLLER_ENV;

diff --git a/common/test/basicwithenv.yaml b/common/test/basicwithenv.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   serviceUrlAgent: ${SERVICE_URL_AGENT}
   test: ${parseInt("${TEST}")}
 load_pattern:

diff --git a/common/test/basicwithfiles.yaml b/common/test/basicwithfiles.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   logDir: ${SPLUNK_PATH}
 load_pattern:
   - linear:

diff --git a/common/test/basicwithvars.yaml b/common/test/basicwithvars.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   serviceUrlAgent: 127.0.0.1:8080
 load_pattern:
   - linear:

diff --git a/common/test/mock.ts b/common/test/mock.ts
@@ -241,6 +241,7 @@ export function mockSqs (): AwsStub<SQSServiceInputTypes, SQSServiceOutputTypes,
 export function resetMockSqs (): void {
   if (_mockedSqsInstance !== undefined) {
     _mockedSqsInstance.reset();
+    _mockedSqsInstance.restore();
     sqsConfig.sqsClient = undefined as any;
     _mockedSqsInstance = undefined;
   }

diff --git a/common/test/yamlparser.spec.ts b/common/test/yamlparser.spec.ts
@@ -136,44 +136,44 @@ describe("YamlParser", () => {
       })
       .catch((error) => done(error));
     });
-  });
 
-  it(BASIC_FILEPATH_WITH_FILES + " should be valid", (done: Mocha.Done) => {
-    YamlParser.parseYamlFile(BASIC_FILEPATH_WITH_FILES, { SPLUNK_PATH: UNIT_TEST_FOLDER })
-    .then((yamlParser: YamlParser) => {
-      expect(yamlParser).to.not.equal(undefined);
-      expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
-      expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
-      expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(1);
-      expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(2);
-      done();
-    })
-    .catch((error) => done(error));
-  });
+    it(BASIC_FILEPATH_WITH_FILES + " should be valid", (done: Mocha.Done) => {
+      YamlParser.parseYamlFile(BASIC_FILEPATH_WITH_FILES, { SPLUNK_PATH: UNIT_TEST_FOLDER })
+      .then((yamlParser: YamlParser) => {
+        expect(yamlParser).to.not.equal(undefined);
+        expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
+        expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
+        expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(1);
+        expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(2);
+        done();
+      })
+      .catch((error) => done(error));
+    });
 
-  it(BASIC_FILEPATH_NO_PEAK_LOAD + " should be valid", (done: Mocha.Done) => {
-    YamlParser.parseYamlFile(BASIC_FILEPATH_NO_PEAK_LOAD, {})
-    .then((yamlParser: YamlParser) => {
-      expect(yamlParser).to.not.equal(undefined);
-      expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
-      expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
-      expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(0);
-      expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(0);
-      done();
-    })
-    .catch((error) => done(error));
-  });
+    it(BASIC_FILEPATH_NO_PEAK_LOAD + " should be valid", (done: Mocha.Done) => {
+      YamlParser.parseYamlFile(BASIC_FILEPATH_NO_PEAK_LOAD, {})
+      .then((yamlParser: YamlParser) => {
+        expect(yamlParser).to.not.equal(undefined);
+        expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
+        expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
+        expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(0);
+        expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(0);
+        done();
+      })
+      .catch((error) => done(error));
+    });
 
-  it(BASIC_FILEPATH_HEADERS_ALL + " should be valid", (done: Mocha.Done) => {
-    YamlParser.parseYamlFile(BASIC_FILEPATH_HEADERS_ALL, {})
-    .then((yamlParser: YamlParser) => {
-      expect(yamlParser).to.not.equal(undefined);
-      expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
-      expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
-      expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(0);
-      expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(0);
-      done();
-    })
-    .catch((error) => done(error));
+    it(BASIC_FILEPATH_HEADERS_ALL + " should be valid", (done: Mocha.Done) => {
+      YamlParser.parseYamlFile(BASIC_FILEPATH_HEADERS_ALL, {})
+      .then((yamlParser: YamlParser) => {
+        expect(yamlParser).to.not.equal(undefined);
+        expect(yamlParser.getBucketSizeMs(), "getBucketSizeMs").to.equal(60000);
+        expect(yamlParser.getTestRunTimeMn(), "getTestRunTimeMn").to.equal(2);
+        expect(yamlParser.getInputFileNames().length, "getInputFileNames().length").to.equal(0);
+        expect(yamlParser.getLoggerFileNames().length, "getLoggerFileNames().length").to.equal(0);
+        done();
+      })
+      .catch((error) => done(error));
+    });
   });
 });
diff --git a/controller/components/YamlViewer/story.tsx b/controller/components/YamlViewer/story.tsx
@@ -11,7 +11,6 @@ import React from "react";
 const yamlContents = `vars:
 rampTime: 1m
 loadTime: 1m
-totalTime: 2m
 serviceUrlAgent: \${SERVICE_URL_AGENT}
 load_pattern:
 - linear:
@@ -38,7 +37,6 @@ endpoints:
 const yamlContentsLarge = `vars:
 rampTime: 1m
 loadTime: 1m
-totalTime: 2m
 logDir: \${SPLUNK_PATH}
 load_pattern:
 - linear:

diff --git a/controller/test/basicwithenv.yaml b/controller/test/basicwithenv.yaml
@@ -1,7 +1,6 @@
 vars:
   rampTime: 1m
   loadTime: 1m
-  totalTime: 2m
   serviceUrlAgent: ${SERVICE_URL_AGENT}
   test1: ${TEST1}
   test2: ${TEST2}

diff --git a/guide/results-viewer-react/src/components/YamlViewer/story.tsx b/guide/results-viewer-react/src/components/YamlViewer/story.tsx
@@ -11,7 +11,6 @@ import React from "react";
 const yamlContents = `vars:
 rampTime: 1m
 loadTime: 1m
-totalTime: 2m
 serviceUrlAgent: \${SERVICE_URL_AGENT}
 load_pattern:
 - linear:
@@ -38,7 +37,6 @@ endpoints:
 const yamlContentsLarge = `vars:
 rampTime: 1m
 loadTime: 1m
-totalTime: 2m
 logDir: \${SPLUNK_PATH}
 load_pattern:
 - linear: