fix(k8s): ensure test results get stored if test fails

garden-io · Apr 30, 2019 · 7ec1bae · 7ec1bae
1 parent ed0a9c9
commit 7ec1bae
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/garden-service/src/commands/get/get-test-result.ts b/garden-service/src/commands/get/get-test-result.ts
@@ -106,7 +106,7 @@ export class GetTestResultCommand extends Command<Args> {
       log.info(highlightYaml(yamlStatus))
       return { result: output }
     } else {
-      const errorMessage = `Could not find results for task '${testName}'`
+      const errorMessage = `Could not find results for test '${testName}'`
 
       log.info(errorMessage)
 

diff --git a/garden-service/src/plugins/kubernetes/container/run.ts b/garden-service/src/plugins/kubernetes/container/run.ts
@@ -73,7 +73,7 @@ export async function execInService(params: ExecInServiceParams<ContainerModule>
     context: api.context,
     namespace,
     args: kubecmd,
-    reject: false,
+    ignoreError: true,
     timeout: 999999,
     tty: interactive,
   })

diff --git a/garden-service/src/plugins/kubernetes/container/test.ts b/garden-service/src/plugins/kubernetes/container/test.ts
@@ -27,6 +27,7 @@ export async function testContainerModule(
     module,
     command,
     interactive,
+    ignoreError: true, // to ensure results get stored when an error occurs
     runtimeContext,
     timeout,
     log,

diff --git a/garden-service/src/plugins/kubernetes/helm/test.ts b/garden-service/src/plugins/kubernetes/helm/test.ts
@@ -43,7 +43,7 @@ export async function testHelmModule(
     args,
     image,
     interactive,
-    ignoreError: true,
+    ignoreError: true, // to ensure results get stored when an error occurs
     timeout,
     log,
   })

diff --git a/garden-service/src/plugins/kubernetes/run.ts b/garden-service/src/plugins/kubernetes/run.ts
@@ -69,8 +69,8 @@ export async function runPod(
     log,
     context,
     namespace,
+    ignoreError,
     args: kubecmd,
-    reject: !ignoreError,
     timeout,
     tty: interactive,
   })

diff --git a/garden-service/src/util/ext-tools.ts b/garden-service/src/util/ext-tools.ts
@@ -218,7 +218,7 @@ export interface ExecParams {
   log: LogEntry
   timeout?: number
   input?: Buffer | string
-  reject?: boolean
+  ignoreError?: boolean
 }
 
 export interface SpawnParams extends ExecParams {
@@ -276,11 +276,12 @@ export class BinaryCmd extends Library {
     return crossSpawn(path, args || [], { cwd: cwd || dirname(path), env })
   }
 
-  async spawnAndWait({ args, cwd, env, log, timeout, tty }: SpawnParams) {
+  async spawnAndWait({ args, cwd, env, log, ignoreError, timeout, tty }: SpawnParams) {
     const path = await this.getPath(log)
     return spawn(path, args || [], {
       cwd: cwd || dirname(path),
       timeout: this.getTimeout(timeout),
+      ignoreError,
       env,
       tty,
     })