fixup! Bulk convert to using testify/suite for tests

astronomer · May 8, 2023 · 6845b64 · 6845b64
1 parent f6435f8
commit 6845b64
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/houston/decorator_test.go b/houston/decorator_test.go
@@ -7,9 +7,7 @@ import (
 var errMockHouston = errors.New("mock houston error")
 
 func (s *Suite) Test_isCalledFromUnitTestFile() {
-	if got := isCalledFromUnitTestFile(); got != true {
-		t.Errorf("isCalledFromUnitTestFile() = %v, want %v", got, true)
-	}
+	s.True(isCalledFromUnitTestFile())
 }
 
 func (s *Suite) TestSanitiseVersionString() {
@@ -39,9 +37,7 @@ func (s *Suite) TestSanitiseVersionString() {
 	}
 	for _, tt := range tests {
 		s.Run(tt.name, func() {
-			if got := sanitiseVersionString(tt.args.v); got != tt.want {
-				t.Errorf("sanitiseVersionString() = %v, want %v", got, tt.want)
-			}
+			s.Equal(sanitiseVersionString(tt.args.v), tt.want)
 		})
 	}
 }

diff --git a/houston/websocket_test.go b/houston/websocket_test.go
@@ -49,12 +49,12 @@ func (s *Suite) TestBuildDeploymentLogsSubscribeRequest() {
 
 func (s *Suite) TestSubscribe() {
 	// Create test server with the echo handler.
-	s := httptest.NewServer(http.HandlerFunc(websocketHandler))
-	defer s.Close()
+	sock := httptest.NewServer(http.HandlerFunc(websocketHandler))
+	defer sock.Close()
 
 	s.Run("success", func() {
 		// Convert http://127.0.0.1 to ws://127.0.0.
-		url := "ws" + strings.TrimPrefix(s.URL, "http")
+		url := "ws" + strings.TrimPrefix(sock.URL, "http")
 
 		err := Subscribe("test-token", url, `{"type": "test", "payload": {"data": {"log": {"log": "test"}}}}`)
 		s.NoError(err)

diff --git a/software/deployment/deployment_test.go b/software/deployment/deployment_test.go
@@ -841,7 +841,6 @@ Nothing to cancel. You are currently running Airflow 1.10.10 and you have not in
 
 		buf := new(bytes.Buffer)
 		err = AirflowUpgrade(deploymentID, "", api, buf)
-		t.Log(buf.String()) // Log the buffer so that this test is recognized by go test
 
 		s.NoError(err)
 		expected := `#     AIRFLOW VERSION                  
@@ -891,7 +890,6 @@ func (s *Suite) Test_getAirflowVersionSelection() {
 		os.Stdin = r
 
 		airflowVersion, err := getAirflowVersionSelection("1.10.7", api, buf)
-		t.Log(buf.String()) // Log the buffer so that this test is recognized by go test
 		s.NoError(err)
 		s.Equal("1.10.12", airflowVersion)
 		api.AssertExpectations(s.T())
@@ -1343,7 +1341,6 @@ To cancel, run:
 
 		buf := new(bytes.Buffer)
 		err = RuntimeUpgrade(mockDeployment.ID, "", api, buf)
-		t.Log(buf.String()) // Log the buffer so that this test is recognized by go test
 
 		s.NoError(err)
 		expected := `#     RUNTIME VERSION