Ensure that httptest.Server is always closed.

Signed-off-by: Thomas Hallgren <[email protected]>

pkg/agent/agent_internal_test.go

@@ -563,6 +563,13 @@ func TestWatchErrorSendingSnapshot(t *testing.T) {
 		_, err = w.Write(enSnapshot)
 		assert.NoError(t, err)
 	}))
+	tsClosed := false
+	defer func() {
+		// If we missed closing the server due to a fatal error
+		if !tsClosed {
+			ts.Close()
+		}
+	}()
 	a.AESSnapshotURL = parseURL(t, ts.URL)
 	mockError := errors.New("MockClient: Error sending report")
 
@@ -609,6 +616,7 @@ func TestWatchErrorSendingSnapshot(t *testing.T) {
 		t.Fatal("Timed out waiting for report to complete.")
 	}
 	ts.Close()
+	tsClosed = true
 
 	select {
 	case err := <-watchDone: