From c0b4cbc79bf5ae6ee5cf1b31e1db649c24ad19f3 Mon Sep 17 00:00:00 2001
From: Veeti Haapsamo <veeti@garden.io>
Date: Thu, 11 May 2023 13:27:08 +0300
Subject: [PATCH] 0.13 clean up some skipped tests (#4230)

* test: re-enable volume module test

* chore: add TODO-G2 on compatibleTypes test

* test: remove skipped 3yo unimplemented test

* test: re-enable deploy action force test

* test: remove skipped 4yo test
---
 .../kubernetes/container/deployment.ts        |  4 +---
 .../src/actions/action-configs-to-graph.ts    |  1 +
 .../test/unit/src/server/core-event-stream.ts |  4 ----
 core/test/unit/src/tasks/deploy.ts            |  5 +---
 e2e/test/pre-release.ts                       | 23 -------------------
 5 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/core/test/integ/src/plugins/kubernetes/container/deployment.ts b/core/test/integ/src/plugins/kubernetes/container/deployment.ts
index 037154f8d1..74ac350d1d 100644
--- a/core/test/integ/src/plugins/kubernetes/container/deployment.ts
+++ b/core/test/integ/src/plugins/kubernetes/container/deployment.ts
@@ -751,9 +751,7 @@ describe("kubernetes container deployment handlers", () => {
         expect(status.state).to.eql("ready")
       })
 
-      // TODO-G2: weird solver behaviour (action status not passed to deploy task process method)
-      // https://github.com/garden-io/garden/pull/3786#discussion_r1109433412
-      it.skip("should deploy a service referencing a volume module", async () => {
+      it("should deploy a service referencing a volume module", async () => {
         const action = await resolveDeployAction("volume-reference")
 
         const deployTask = new DeployTask({
diff --git a/core/test/unit/src/actions/action-configs-to-graph.ts b/core/test/unit/src/actions/action-configs-to-graph.ts
index e3d6a11f58..bed166f513 100644
--- a/core/test/unit/src/actions/action-configs-to-graph.ts
+++ b/core/test/unit/src/actions/action-configs-to-graph.ts
@@ -393,6 +393,7 @@ describe("actionConfigsToGraph", () => {
     expect(action.isCompatible("test")).to.be.true
   })
 
+  // TODO-G2
   it.skip("correctly sets compatibleTypes for an action type with a base", async () => {
     const graph = await actionConfigsToGraph({
       garden,
diff --git a/core/test/unit/src/server/core-event-stream.ts b/core/test/unit/src/server/core-event-stream.ts
index 338e0b2c97..600431a7a8 100644
--- a/core/test/unit/src/server/core-event-stream.ts
+++ b/core/test/unit/src/server/core-event-stream.ts
@@ -270,8 +270,4 @@ describe("CoreEventStream", () => {
     // Wait for it to come up
     await pEvent(garden.events, "serversUpdated", { timeout: 5000 })
   })
-
-  it.skip("removes target hosts that are unreachable", async () => {
-    // TODO: let's see if we need this on top of the polling
-  })
 })
diff --git a/core/test/unit/src/tasks/deploy.ts b/core/test/unit/src/tasks/deploy.ts
index ee3f32e891..1352291860 100644
--- a/core/test/unit/src/tasks/deploy.ts
+++ b/core/test/unit/src/tasks/deploy.ts
@@ -7,7 +7,6 @@
  */
 
 import tmp from "tmp-promise"
-import execa from "execa"
 
 import { ProjectConfig } from "../../../../src/config/project"
 import { ConfigGraph } from "../../../../src/graph/config-graph"
@@ -16,7 +15,6 @@ import { DeployTask } from "../../../../src/tasks/deploy"
 import { expect } from "chai"
 import { createProjectConfig, makeTempDir, TestGarden } from "../../../helpers"
 import { joi } from "../../../../src/config/common"
-import { ActionConfig } from "../../../../src/actions/types"
 
 describe("DeployTask", () => {
   let tmpDir: tmp.DirectoryResult
@@ -147,8 +145,7 @@ describe("DeployTask", () => {
   })
 
   describe("resolveProcessDependencies", () => {
-    // TODO-G2B: this might make sense to implement but is not strictly needed
-    it.skip("should always return deploy action's dependencies having force = false", async () => {
+    it("should always return deploy action's dependencies having force = false", async () => {
       const action = graph.getDeploy("test-deploy")
 
       const forcedDeployTask = new DeployTask({
diff --git a/e2e/test/pre-release.ts b/e2e/test/pre-release.ts
index 4b26a918b4..b8887698fb 100644
--- a/e2e/test/pre-release.ts
+++ b/e2e/test/pre-release.ts
@@ -120,29 +120,6 @@ describe("PreReleaseTests", () => {
     })
   }
 
-  if (project === "tasks") {
-    /*
-     * TODO: Re-enable once this has been debugged:
-     *
-     * TimeoutError: Knex: Timeout acquiring a connection. The pool is probably full.
-     * Are you missing a .transacting(trx) call?
-     */
-    describe.skip("tasks", () => {
-      it("calls the hello service to fetch the usernames populated by the ruby migration", async () => {
-        /**
-         * Verify that the output includes the usernames populated by the ruby-migration task.
-         * The users table was created by the node-migration task.
-         */
-        await runWithEnv(["deploy"])
-        const logEntries = await runWithEnv(["call", "hello"])
-        expect(
-          searchLog(logEntries, /John, Paul, George, Ringo/),
-          "expected to find populated usernames in log output"
-        ).to.eql("passed")
-      })
-    })
-  }
-
   if (project === "code-synchronization") {
     describe("code-synchronization", () => {
       it("runs the dev command with code-synchronization enabled", async () => {