Add constant and update tests

Author: MDrakos

internal/constants/constants.go

@@ -133,6 +133,9 @@ const OverwriteDefaultSystemPathEnvVarName = "ACTIVESTATE_TEST_SYSTEM_PATH"
 // TestAutoUpdateEnvVarName is used to test auto updates, when set to true will always attempt to auto update
 const TestAutoUpdateEnvVarName = "ACTIVESTATE_TEST_AUTO_UPDATE"
 
+// TestUpdateURLEnvVarName is used to test update urls, when set to a url will override the default update url
+const TestUpdateURLEnvVarName = "ACTIVESTATE_TEST_UPDATE_URL"
+
 // ForceUpdateEnvVarName is used to force state tool to update, regardless of whether the update is equal to the current version
 const ForceUpdateEnvVarName = "ACTIVESTATE_FORCE_UPDATE"
 

internal/updater/updater.go

@@ -128,7 +128,7 @@ func NewUpdateInstaller(cfg Configurable, an analytics.Dispatcher, avUpdate *Ava
 func getAPIUpdateURL(cfg Configurable, path string) string {
 	var apiUpdateURL string
 
-	envUrl := os.Getenv("_TEST_UPDATE_URL")
+	envUrl := os.Getenv(constants.TestUpdateURLEnvVarName)
 	cfgUrl := cfg.GetString(constants.UpdateEndpointConfig)
 	switch {
 	case envUrl != "":

test/integration/update_int_test.go

@@ -320,9 +320,8 @@ func (suite *UpdateIntegrationTestSuite) TestUpdateInfoHost() {
 	cp.ExpectExitCode(0)
 
 	cp = ts.SpawnWithOpts(
-		e2e.OptArgs("update"),
+		e2e.OptArgs("update", "-v"),
 		e2e.OptAppendEnv(suite.env(false, false)...),
-		e2e.OptAppendEnv("VERBOSE=true"),
 	)
 	cp.ExpectExitCode(0)
 
@@ -340,11 +339,11 @@ func (suite *UpdateIntegrationTestSuite) TestUpdateHost_SetBeforeInvocation() {
 	suite.Assert().Equal(ts.GetConfig(constants.UpdateInfoEndpointConfig), "https://test.example.com/update")
 
 	cp := ts.SpawnWithOpts(
-		e2e.OptArgs("update"),
+		e2e.OptArgs("update", "-v"),
 		e2e.OptAppendEnv(suite.env(false, false)...),
-		e2e.OptAppendEnv("VERBOSE=true"),
 	)
 	cp.ExpectExitCode(11) // Expect failure due to DNS resolution of fake host
+	ts.IgnoreLogErrors()
 
 	correctHostCount := 0
 	incorrectHostCount := 0
@@ -372,22 +371,21 @@ func (suite *UpdateIntegrationTestSuite) TestUpdateHost() {
 	ts := e2e.New(suite.T(), false)
 	defer ts.Close()
 
-	cp := ts.Spawn("config", "set", constants.UpdateEndpointConfig, "https://example.com/update")
+	cp := ts.Spawn("config", "set", constants.UpdateEndpointConfig, "https://test.example.com/update")
 	cp.Expect("Successfully set config key")
 	cp.ExpectExitCode(0)
 
 	cp = ts.SpawnWithOpts(
-		e2e.OptArgs("update"),
+		e2e.OptArgs("update", "-v"),
 		e2e.OptAppendEnv(suite.env(false, false)...),
-		e2e.OptAppendEnv("VERBOSE=true"),
 	)
 	cp.ExpectExitCode(0)
 
 	correctHostCount := 0
 	incorrectHostCount := 0
 	for _, path := range ts.LogFiles() {
 		contents := string(fileutils.ReadFileUnsafe(path))
-		if strings.Contains(contents, "https://example.com/update") {
+		if strings.Contains(contents, "https://test.example.com/update") {
 			correctHostCount++
 		}
 		if strings.Contains(contents, "https://state-tool.activestate.com/update") {