Proxy restore/race condition handling. Force ignore PROXY_MANUAL_STAR…

…T in internal tests
Azure · Jul 20, 2023 · ee6260d · ee6260d
1 parent 7a59789
commit ee6260d
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 138 deletions.
diff --git a/sdk/internal/perf/recording_test.go b/sdk/internal/perf/recording_test.go
@@ -4,20 +4,37 @@
 package perf
 
 import (
+	"fmt"
 	"net/http"
+	"os"
 	"regexp"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
+	"github.com/Azure/azure-sdk-for-go/sdk/internal/recording"
 )
 
 func TestRecordingHTTPClient_Do(t *testing.T) {
+	// Ignore manual start in pipeline tests, we always want to exercise install
+	os.Setenv(recording.ProxyManualStartEnv, "false")
+
+	proxy, err := recording.StartTestProxy("", nil)
+	require.NoError(t, err)
+	defer func() {
+		err := recording.StopTestProxy(proxy)
+		if err != nil {
+			panic(err)
+		}
+	}()
+
 	req, err := http.NewRequest("POST", "https://www.bing.com", nil)
 	require.NoError(t, err)
 
+	proxyURL := fmt.Sprintf("https://localhost:%d", proxy.Options.ProxyPort)
 	client := NewProxyTransport(&TransportOptions{
 		TestName: t.Name(),
-		proxyURL: "https://localhost:5001/",
+		proxyURL: proxyURL,
 	})
 	require.NotNil(t, client)
 
@@ -32,7 +49,7 @@ func TestRecordingHTTPClient_Do(t *testing.T) {
 	require.NoError(t, err)
 	resp, err = client.Do(req)
 	require.NoError(t, err)
-	require.Equal(t, "https://localhost:5001", resp.Request.URL.String())
+	require.Equal(t, proxyURL, resp.Request.URL.String())
 	require.Contains(t, resp.Request.Header.Get(upstreamURIHeader), "https://www.bing.com")
 	require.Equal(t, resp.Request.Header.Get(modeHeader), "record")
 	require.Equal(t, resp.Request.Header.Get(idHeader), client.recID)
@@ -42,7 +59,7 @@ func TestRecordingHTTPClient_Do(t *testing.T) {
 	require.NoError(t, err)
 	resp, err = client.Do(req)
 	require.NoError(t, err)
-	require.Equal(t, "https://localhost:5001", resp.Request.URL.String())
+	require.Equal(t, proxyURL, resp.Request.URL.String())
 	require.Contains(t, resp.Request.Header.Get(upstreamURIHeader), "https://www.bing.com")
 	require.Equal(t, resp.Request.Header.Get(modeHeader), "playback")
 	require.Equal(t, resp.Request.Header.Get(idHeader), client.recID)

diff --git a/sdk/internal/recording/matchers_test.go b/sdk/internal/recording/matchers_test.go
@@ -26,7 +26,9 @@ func TestMatchers(t *testing.T) {
 }
 
 func (s *matchersTests) SetupSuite() {
-	proxy, err := StartTestProxy(nil)
+	// Ignore manual start in pipeline tests, we always want to exercise install
+	os.Setenv(ProxyManualStartEnv, "false")
+	proxy, err := StartTestProxy("", nil)
 	s.proxy = proxy
 	require.NoError(s.T(), err)
 }

diff --git a/sdk/internal/recording/recording_test.go b/sdk/internal/recording/recording_test.go
@@ -36,7 +36,9 @@ func TestRecording(t *testing.T) {
 }
 
 func (s *recordingTests) SetupSuite() {
-	proxy, err := StartTestProxy(nil)
+	// Ignore manual start in pipeline tests, we always want to exercise install
+	os.Setenv(ProxyManualStartEnv, "false")
+	proxy, err := StartTestProxy("", nil)
 	s.proxy = proxy
 	require.NoError(s.T(), err)
 }

diff --git a/sdk/internal/recording/sanitizer_test.go b/sdk/internal/recording/sanitizer_test.go
@@ -38,7 +38,7 @@ func TestRecordingSanitizer(t *testing.T) {
 }
 
 func (s *sanitizerTests) SetupSuite() {
-	proxy, err := StartTestProxy(nil)
+	proxy, err := StartTestProxy("", nil)
 	s.proxy = proxy
 	require.NoError(s.T(), err)
 }