fix(installer): Wait on installer to avoid flaky test (#33295)

DataDog · Jan 23, 2025 · f1383a3 · f1383a3
1 parent 2759238
commit f1383a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/new-e2e/tests/installer/host/host.go b/test/new-e2e/tests/installer/host/host.go
@@ -172,7 +172,7 @@ func (h *Host) WaitForUnitActivating(t *testing.T, units ...string) {
 			h.t.Logf("installer exp logs:\n%s", h.remote.MustExecute("sudo journalctl -xeu datadog-installer-exp"))
 			h.t.Logf("unit %s logs:\n%s", unit, h.remote.MustExecute("sudo journalctl -xeu "+unit))
 		}
-		require.NoError(t, err, "unit %s did not become activating")
+		require.NoError(t, err, "unit %s did not become activating", unit)
 	}
 }
 

diff --git a/test/new-e2e/tests/installer/unix/upgrade_scenario_test.go b/test/new-e2e/tests/installer/unix/upgrade_scenario_test.go
@@ -386,6 +386,8 @@ func (s *upgradeScenarioSuite) TestInstallerAgentFailure() {
 	s.stopExperiment(datadogInstaller) // Can't check error
 	s.assertSuccessfulInstallerStopExperiment(timestamp)
 
+	s.host.WaitForUnitActive(installerUnit)
+
 	// Retry the golden path to check if everything fine
 	s.setCatalog(testCatalog)
 	s.executeInstallerGoldenPath()