From b85928e73c7a36f01bed64c722a8664aac858091 Mon Sep 17 00:00:00 2001 From: Kevin Leimkuhler Date: Wed, 6 Jan 2021 17:49:16 -0500 Subject: [PATCH] Enable dashboard test (#5486) This test was never broken. My best guess is that CI was not merging with the latest `main` as we have recently noticed, so this was an issue that was fixed by #5458 Closes #5478 Signed-off-by: Kevin Leimkuhler --- test/integration/install_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/integration/install_test.go b/test/integration/install_test.go index 09c7369ab..05dcc92ea 100644 --- a/test/integration/install_test.go +++ b/test/integration/install_test.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "strconv" "strings" "testing" "time" @@ -613,6 +614,7 @@ func TestUpgradeHelm(t *testing.T) { "--set", "dashboard.image.tag=" + TestHelper.GetVersion(), "--set", "grafana.image.tag=" + TestHelper.GetVersion(), "--set", "tap.image.tag=" + TestHelper.GetVersion(), + "--wait", } // Install Viz Extension Chart if stdout, stderr, err := TestHelper.HelmInstallPlain(vizChart, "l5d-viz", vizArgs...); err != nil { @@ -813,10 +815,6 @@ func TestInstallSP(t *testing.T) { } } -// This test fails because no web component is installed during this phase of -// the extension split. It should be renabled after the issue below is closed. -// Issue: https://github.com/linkerd/linkerd2/issues/5478 -/* func TestDashboard(t *testing.T) { dashboardPort := 52237 dashboardURL := fmt.Sprintf("http://localhost:%d", dashboardPort) @@ -853,7 +851,6 @@ func TestDashboard(t *testing.T) { resp, TestHelper.GetVersion()) } } -*/ func TestInject(t *testing.T) { resources, err := testutil.ReadFile("testdata/smoke_test.yaml")