Fix tests

aibaars · aibaars · commit ca53360d04e9 · 2025-07-15T07:25:49.000Z
diff --git a/src/analyze-action-env.test.ts b/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");
diff --git a/src/analyze-action-input.test.ts b/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");
diff --git a/src/upload-lib.ts b/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";
@@ -266,8 +265,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"),
     };
diff --git a/src/util.test.ts b/src/util.test.ts
@@ -300,9 +300,10 @@ const shortTime = 10;
 test("withTimeout on long task", async (t) => {
   let longTaskTimedOut = false;
   const longTask = new Promise((resolve) => {
-    setTimeout(() => {
+    const timer = setTimeout(() => {
       resolve(42);
     }, longTime);
+    t.teardown(() => clearTimeout(timer));
   });
   const result = await util.withTimeout(shortTime, longTask, () => {
     longTaskTimedOut = true;
