Fix tests

Author: aibaars

src/analyze-action-env.test.ts

@@ -47,6 +47,7 @@ test("analyze action with RAM & threads from environment variables", async (t) =
     const requiredInputStub = sinon.stub(actionsUtil, "getRequiredInput");
     requiredInputStub.withArgs("token").returns("fake-token");
     requiredInputStub.withArgs("upload-database").returns("false");
+    requiredInputStub.withArgs("output").returns("out");
     const optionalInputStub = sinon.stub(actionsUtil, "getOptionalInput");
     optionalInputStub.withArgs("cleanup-level").returns("none");
     optionalInputStub.withArgs("expect-error").returns("false");

src/analyze-action-input.test.ts

@@ -45,6 +45,7 @@ test("analyze action with RAM & threads from action inputs", async (t) => {
     const requiredInputStub = sinon.stub(actionsUtil, "getRequiredInput");
     requiredInputStub.withArgs("token").returns("fake-token");
     requiredInputStub.withArgs("upload-database").returns("false");
+    requiredInputStub.withArgs("output").returns("out");
     const optionalInputStub = sinon.stub(actionsUtil, "getOptionalInput");
     optionalInputStub.withArgs("cleanup-level").returns("none");
     optionalInputStub.withArgs("expect-error").returns("false");

src/upload-lib.ts

@@ -9,7 +9,6 @@ import * as jsonschema from "jsonschema";
 import * as semver from "semver";
 
 import * as actionsUtil from "./actions-util";
-import { getOptionalInput, getRequiredInput } from "./actions-util";
 import * as api from "./api-client";
 import { getGitHubVersion, wrapApiConfigurationError } from "./api-client";
 import { CodeQL, getCodeQL } from "./codeql";
@@ -259,8 +258,8 @@ async function combineSarifFilesUsingCLI(
     );
 
     const apiDetails = {
-      auth: getRequiredInput("token"),
-      externalRepoAuth: getOptionalInput("external-repository-token"),
+      auth: actionsUtil.getRequiredInput("token"),
+      externalRepoAuth: actionsUtil.getOptionalInput("external-repository-token"),
       url: getRequiredEnvParam("GITHUB_SERVER_URL"),
       apiURL: getRequiredEnvParam("GITHUB_API_URL"),
     };

src/util.test.ts

@@ -299,13 +299,15 @@ const shortTime = 10;
 
 test("withTimeout on long task", async (t) => {
   let longTaskTimedOut = false;
+  let timer : NodeJS.Timeout | undefined = undefined;
   const longTask = new Promise((resolve) => {
-    setTimeout(() => {
+    timer = setTimeout(() => {
       resolve(42);
     }, longTime);
   });
   const result = await util.withTimeout(shortTime, longTask, () => {
     longTaskTimedOut = true;
+    clearTimeout(timer);
   });
   t.deepEqual(longTaskTimedOut, true);
   t.deepEqual(result, undefined);