From ae1d897f127aa73b0f5aade74a02add7fe525aa7 Mon Sep 17 00:00:00 2001 From: Robert Stein Date: Wed, 21 Jun 2023 14:00:58 +0200 Subject: [PATCH] chore: use click test helper --- client/tests/e2e/base.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/client/tests/e2e/base.py b/client/tests/e2e/base.py index 3ea2c4c5..31073858 100644 --- a/client/tests/e2e/base.py +++ b/client/tests/e2e/base.py @@ -1,5 +1,5 @@ from copy import deepcopy -from unittest import mock +from click.testing import CliRunner from gefyra.api.list import get_bridges_and_print, get_containers_and_print from gefyra.cli.updown import cluster_up, cluster_down @@ -52,10 +52,13 @@ def up(): - ctx = mock.Mock() - ctx.obj = dict() - ctx.obj["kubeconfig"] = "~/.kube/config" - cluster_up(ctx) + runner = CliRunner() + runner.invoke(cluster_up) + + +def down(): + runner = CliRunner() + runner.invoke(cluster_down) class GefyraBaseTest: @@ -403,7 +406,7 @@ def test_a_run_gefyra_up_in_another_docker_context(self): self.assertTrue(res) self.assert_operator_ready() self.assert_stowaway_ready() - cluster_down() + down() ContextAPI.set_current_context("default") ContextAPI.remove_context("another-context") @@ -673,7 +676,7 @@ def test_m_ownership_reference_check(self): ) def test_n_run_gefyra_cluster_down(self): - res = cluster_down() + res = down() self.assertTrue(res) _status = status() self.assertEqual(_status.summary, StatusSummary.DOWN) @@ -686,7 +689,7 @@ def test_n_run_gefyra_cluster_down(self): self.assert_namespace_not_found("gefyra") def test_n_run_gefyra_down_again_without_errors(self): - self.test_n_run_gefyra_cluster_down() + self.down() def test_o_reflect_occupied_port(self): container_name = "busybox" @@ -725,7 +728,7 @@ def test_p_reflect(self): self._stop_container( container="gefyra-reflect-default-deploy-bye-nginxdemo-8000" ) - res = cluster_down() + res = down() self.assertTrue(res) def test_p_reflect_port_overwrite(self): @@ -747,7 +750,7 @@ def test_p_reflect_port_overwrite(self): self._stop_container( container="gefyra-reflect-default-deploy-bye-nginxdemo-8000" ) - res = cluster_down() + res = down() self.assertTrue(res) def test_p_reflect_image_overwrite(self): @@ -775,7 +778,7 @@ def test_p_reflect_image_overwrite(self): self._stop_container( container="gefyra-reflect-default-deploy-bye-nginxdemo-8000" ) - res = cluster_down() + res = down() self.assertTrue(res) def test_util_for_pod_not_found(self):