Refactor tests

cmd/synthetic_checks_test.go

@@ -148,8 +148,7 @@ func TestRunSyntheticTests(t *testing.T) {
 			defer mockPromAggregationGateway.Close()
 
 			// Set the PROM_AGGREGATION_GATEWAY_URL to the mock server's URL
-			os.Setenv(c.EnvPromAggregationGatewayUrl, mockPromAggregationGateway.URL)
-			defer os.Unsetenv(c.EnvPromAggregationGatewayUrl)
+			t.Setenv(c.EnvPromAggregationGatewayUrl, mockPromAggregationGateway.URL)
 
 			// Convert MockApplications to real ones
 			var appData []*a.Application
@@ -201,12 +200,14 @@ func TestDoCheck(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 
 			// Set up environment variables and command line arguments
-			os.Setenv(c.EnvYamlPath, tt.envYamlPath)
-			os.Setenv(c.EnvSlackWebhookUrl, tt.envSlackUrl)
-			os.Setenv(c.EnvClusterInfo, tt.envClusterInfo)
-			os.Setenv(c.EnvPromAggregationGatewayUrl, mockPushgateway.URL)
+			t.Setenv(c.EnvYamlPath, tt.envYamlPath)
+			t.Setenv(c.EnvSlackWebhookUrl, tt.envSlackUrl)
+			t.Setenv(c.EnvClusterInfo, tt.envClusterInfo)
+			t.Setenv(c.EnvPromAggregationGatewayUrl, mockPushgateway.URL)
 			// Set environment variable to true for this test
-			os.Setenv(c.EnvSkipWhitelistCheck, "true")
+			t.Setenv(c.EnvSkipWhitelistCheck, "true")
+			originalArgs := os.Args
+			defer func() { os.Args = originalArgs }()
 			os.Args = tt.cmdArgs
 
 			// Call function under test
@@ -218,13 +219,6 @@ func TestDoCheck(t *testing.T) {
 			} else {
 				assert.NoError(t, err, "Expected no error but got one")
 			}
-
-			// Unset environment variables
-			os.Unsetenv(c.EnvYamlPath)
-			os.Unsetenv(c.EnvSlackWebhookUrl)
-			os.Unsetenv(c.EnvClusterInfo)
-			os.Unsetenv(c.EnvPromAggregationGatewayUrl)
-			os.Unsetenv(c.EnvSkipWhitelistCheck)
 		})
 	}
 }

pkg/config/config_test.go

@@ -4,7 +4,6 @@ import (
 	a "github.com/NYULibraries/aswa/pkg/application"
 	"github.com/stretchr/testify/assert"
 	"net/http"
-	"os"
 	"testing"
 	"time"
 )
@@ -39,10 +38,9 @@ func TestNewConfig(t *testing.T) {
 func testNewConfigFunc(path string, expectedErr string) func(*testing.T) {
 	return func(t *testing.T) {
 		// Set environment variable to true for this test
-		os.Setenv(EnvSkipWhitelistCheck, "true")
+		t.Setenv(EnvSkipWhitelistCheck, "true")
 		_, err := NewConfig(path)
 
-		os.Unsetenv(EnvSkipWhitelistCheck)
 		if expectedErr == "" {
 			assert.Nil(t, err)
 		} else {

pkg/config/env_vars_test.go

@@ -37,13 +37,12 @@ func TestGetYamlPath(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
-			os.Setenv(EnvYamlPath, tt.envYamlPath)
+			t.Setenv(EnvYamlPath, tt.envYamlPath)
 
 			got := GetYamlPath()
 
 			assert.Equal(t, tt.want, got, "getYamlPath() should return correct yaml path")
 
-			os.Unsetenv(EnvYamlPath)
 		})
 	}
 }
@@ -61,6 +60,8 @@ func TestGetCmdArg(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
+			originalArgs := os.Args
+			defer func() { os.Args = originalArgs }()
 			os.Args = tt.osArgs
 
 			got := GetCmdArg()
@@ -83,13 +84,12 @@ func TestGetSlackWebhookUrl(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
-			os.Setenv(EnvSlackWebhookUrl, tt.envSlackWebhookUrl)
+			t.Setenv(EnvSlackWebhookUrl, tt.envSlackWebhookUrl)
 
 			gotLogMessage := CaptureOutput(GetSlackWebhookUrl)
 
 			assert.Equal(t, tt.wantLogmessage, gotLogMessage, "getSlackWebhookUrl() should return correct Slack webhook URL")
 
-			os.Unsetenv(EnvSlackWebhookUrl)
 		})
 	}
 }
@@ -108,16 +108,14 @@ func TestGetClusterInfo(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 
 			// Set up environment variable
-			os.Setenv(EnvClusterInfo, tt.envClusterInfo)
+			t.Setenv(EnvClusterInfo, tt.envClusterInfo)
 
 			// Call function under test
 			gotLogMessage := CaptureOutput(GetClusterInfo)
 
 			// Assert that the function returns the expected result
 			assert.Equal(t, tt.wantLogMessage, gotLogMessage, "getClusterInfo() should return correct cluster info")
 
-			// Unset environment variable for next test
-			os.Unsetenv(EnvClusterInfo)
 		})
 	}
 }
@@ -135,13 +133,12 @@ func TestGetPromAggregationGatewayUrl(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
-			os.Setenv(EnvPromAggregationGatewayUrl, tt.envPromAggregationGatewayUrl)
+			t.Setenv(EnvPromAggregationGatewayUrl, tt.envPromAggregationGatewayUrl)
 
 			got := GetPromAggregationgatewayUrl()
 
 			assert.Equal(t, tt.want, got, "getPushgatewayUrl() should return correct pushgateway URL")
 
-			os.Unsetenv(EnvPromAggregationGatewayUrl)
 		})
 	}
 
@@ -160,13 +157,12 @@ func TestGetEnvironmentName(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 
-			os.Setenv(EnvName, tt.envName)
+			t.Setenv(EnvName, tt.envName)
 
 			got := GetEnvironmentName()
 
 			assert.Equal(t, tt.want, got, "GetEnvironmentName() should return correct environment name")
 
-			os.Unsetenv(EnvName)
 		})
 	}
 }

pkg/metrics/metrics_test.go

@@ -4,7 +4,6 @@ import (
 	c "github.com/NYULibraries/aswa/pkg/config"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"testing"
 )
 
@@ -37,8 +36,7 @@ func TestPushMetrics(t *testing.T) {
 			defer server.Close()
 
 			// Setup environment variable to mock the pushgateway URL
-			os.Setenv(c.EnvPromAggregationGatewayUrl, server.URL)
-			defer os.Unsetenv(c.EnvPromAggregationGatewayUrl)
+			t.Setenv(c.EnvPromAggregationGatewayUrl, server.URL)
 
 			// Increment a test counter to simulate metrics that would be pushed
 			IncrementFailedTestsCounter("testApp")