test: fix test assertions

garden-io · May 11, 2023 · 2dc878b · 2dc878b
1 parent 77d7ac8
commit 2dc878b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/core/test/data/test-project-b/module-a/garden.yml b/core/test/data/test-project-b/module-a/garden.yml
@@ -3,6 +3,7 @@ name: module-a
 type: test
 services:
   - name: service-a
+    timeout: 600
     ingresses:
       - path: /path-a
         port: http

diff --git a/core/test/data/test-project-b/module-b/garden.yml b/core/test/data/test-project-b/module-b/garden.yml
@@ -3,6 +3,7 @@ name: module-b
 type: test
 services:
   - name: service-b
+    timeout: 600
     ingresses:
       - path: /path-b
         port: http

diff --git a/core/test/data/test-project-b/module-c/garden.yml b/core/test/data/test-project-b/module-c/garden.yml
@@ -4,13 +4,15 @@ type: test
 allowPublish: false
 services:
   - name: service-c
+    timeout: 600
     ingresses:
       - path: /path-c
         port: http
     ports:
       - name: http
         containerPort: 8080
   - name: service-d
+    timeout: 600
     ingresses:
       - path: /path-d
         port: http

diff --git a/core/test/integ/src/plugins/kubernetes/kubernetes-module/config.ts b/core/test/integ/src/plugins/kubernetes/kubernetes-module/config.ts
@@ -13,7 +13,11 @@ import { TestGarden } from "../../../../../helpers"
 import { ModuleConfig } from "../../../../../../src/config/module"
 import { apply } from "json-merge-patch"
 import { getKubernetesTestGarden } from "./common"
-import { DEFAULT_BUILD_TIMEOUT_SEC } from "../../../../../../src/constants"
+import {
+  DEFAULT_BUILD_TIMEOUT_SEC,
+  DEFAULT_RUN_TIMEOUT_SEC,
+  DEFAULT_TEST_TIMEOUT_SEC,
+} from "../../../../../../src/constants"
 
 describe("configureKubernetesModule", () => {
   let garden: TestGarden
@@ -42,7 +46,7 @@ describe("configureKubernetesModule", () => {
       cacheResult: true,
       dependencies: [],
       disabled: false,
-      timeout: null,
+      timeout: DEFAULT_RUN_TIMEOUT_SEC,
       env: {},
       artifacts: [],
     }
@@ -52,7 +56,7 @@ describe("configureKubernetesModule", () => {
       command: ["sh", "-c", "echo ok"],
       dependencies: [],
       disabled: false,
-      timeout: null,
+      timeout: DEFAULT_TEST_TIMEOUT_SEC,
       env: {},
       artifacts: [],
     }
@@ -134,7 +138,7 @@ describe("configureKubernetesModule", () => {
         dependencies: [],
         disabled: false,
         spec: taskSpec,
-        timeout: null,
+        timeout: DEFAULT_RUN_TIMEOUT_SEC,
       },
     ])
 
@@ -144,7 +148,7 @@ describe("configureKubernetesModule", () => {
         dependencies: [],
         disabled: false,
         spec: testSpec,
-        timeout: null,
+        timeout: DEFAULT_TEST_TIMEOUT_SEC,
       },
     ])
   })

diff --git a/core/test/integ/src/plugins/kubernetes/run.ts b/core/test/integ/src/plugins/kubernetes/run.ts
@@ -1294,7 +1294,7 @@ describe("kubernetes Pod runner functions", () => {
           artifactsPath: tmpDir.path,
           image,
           version: action.versionString(),
-          timeout: DEFAULT_RUN_TIMEOUT_SEC,
+          timeout,
         })
 
         expect(result.log.trim()).to.equal(`Command timed out after ${timeout} seconds.`)

diff --git a/core/test/unit/src/garden.ts b/core/test/unit/src/garden.ts
@@ -4568,9 +4568,9 @@ describe("Garden", () => {
     })
 
     context("test against fixed version hashes", async () => {
-      const moduleAVersionString = "v-6abf03be92"
-      const moduleBVersionString = "v-13d9d46957"
-      const moduleCVersionString = "v-554616d870"
+      const moduleAVersionString = "v-15dac6739d"
+      const moduleBVersionString = "v-33728410e6"
+      const moduleCVersionString = "v-bd65300051"
 
       it("should return the same module versions between runtimes", async () => {
         const projectRoot = getDataDir("test-projects", "fixed-version-hashes-1")

diff --git a/core/test/unit/src/vcs/vcs.ts b/core/test/unit/src/vcs/vcs.ts
@@ -329,7 +329,7 @@ describe("getModuleVersionString", () => {
     const garden = await makeTestGarden(projectRoot, { noCache: true })
     const module = await garden.resolveModule("module-a")
 
-    const fixedVersionString = "v-6abf03be92"
+    const fixedVersionString = "v-15dac6739d"
     expect(module.version.versionString).to.eql(fixedVersionString)
 
     delete process.env.TEST_ENV_VAR