Skip to content

Commit c539d69

Browse files
authored
Update azwebpubsub tests for new test proxy (Azure#22892)
1 parent 4fd61cc commit c539d69

File tree

3 files changed

+4
-59
lines changed

3 files changed

+4
-59
lines changed

sdk/messaging/azwebpubsub/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "go",
44
"TagPrefix": "go/messaging/azwebpubsub",
5-
"Tag": "go/messaging/azwebpubsub_94be93d99b"
5+
"Tag": "go/messaging/azwebpubsub_2540bb848a"
66
}

sdk/messaging/azwebpubsub/client_shared_test.go

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type clientWrapper struct {
2626
}
2727

2828
var fakeTestVars = testVars{
29-
ConnectionString: "Endpoint=https://fake.eastus-1.webpubsub.azure.com;AccessKey=ABCDE;",
29+
ConnectionString: "Endpoint=https://fake.webpubsub.azure.com;AccessKey=ABCDE;",
3030
}
3131

3232
type testVars struct {
@@ -109,7 +109,7 @@ func loadClientOptions(t *testing.T) (testVars, *azcore.ClientOptions) {
109109
}
110110
} else {
111111
options = &azcore.ClientOptions{
112-
Transport: newRecordingTransporter(t, tv),
112+
Transport: newRecordingTransporter(t),
113113
}
114114
}
115115

@@ -141,61 +141,16 @@ func newClientWrapper(t *testing.T) clientWrapper {
141141
}
142142
}
143143

144-
func newRecordingTransporter(t *testing.T, testVars testVars) policy.Transporter {
144+
func newRecordingTransporter(t *testing.T) policy.Transporter {
145145
transport, err := recording.NewRecordingHTTPClient(t, nil)
146146
require.NoError(t, err)
147147

148148
err = recording.Start(t, "sdk/messaging/azwebpubsub/testdata", nil)
149149
require.NoError(t, err)
150-
err = recording.AddURISanitizer("https://fake_endpoint.com/", testVars.Endpoint, nil)
151-
require.NoError(t, err)
152150

153151
err = recording.AddGeneralRegexSanitizer(`"Date": "Wed, 15 Nov 2023 08:00:00 GMT"`, `"Date":".+?"`, nil)
154152
require.NoError(t, err)
155153

156-
err = recording.AddGeneralRegexSanitizer(
157-
`"id":"00000000-0000-0000-0000-000000000000"`,
158-
`"id":"[^"]+"`, nil)
159-
require.NoError(t, err)
160-
161-
err = recording.AddGeneralRegexSanitizer(
162-
`"lockToken":"fake-lock-token"`,
163-
`"lockToken":\s*"[^"]+"`, nil)
164-
require.NoError(t, err)
165-
166-
err = recording.AddGeneralRegexSanitizer(
167-
`"lockTokens": ["fake-lock-token"]`,
168-
`"lockTokens":\s*\[\s*"[^"]+"\s*\]`, nil)
169-
require.NoError(t, err)
170-
171-
err = recording.AddGeneralRegexSanitizer(
172-
`"succeededLockTokens": ["fake-lock-token"]`,
173-
`"succeededLockTokens":\s*\[\s*"[^"]+"\s*\]`, nil)
174-
require.NoError(t, err)
175-
176-
err = recording.AddGeneralRegexSanitizer(
177-
`"succeededLockTokens": ["fake-lock-token", "fake-lock-token", "fake-lock-token"]`,
178-
`"succeededLockTokens":\s*`+
179-
`\[`+
180-
`(\s*"[^"]+"\s*\,){2}`+
181-
`\s*"[^"]+"\s*`+
182-
`\]`, nil)
183-
require.NoError(t, err)
184-
185-
err = recording.AddGeneralRegexSanitizer(
186-
`"lockTokens": ["fake-lock-token", "fake-lock-token"]`,
187-
`"lockTokens":\s*\[\s*"[^"]+"\s*\,\s*"[^"]+"\s*\]`, nil)
188-
require.NoError(t, err)
189-
190-
err = recording.AddGeneralRegexSanitizer(
191-
`"lockTokens": ["fake-lock-token", "fake-lock-token", "fake-lock-token"]`,
192-
`"lockTokens":\s*`+
193-
`\[`+
194-
`(\s*"[^"]+"\s*\,){2}`+
195-
`\s*"[^"]+"\s*`+
196-
`\]`, nil)
197-
require.NoError(t, err)
198-
199154
t.Cleanup(func() {
200155
err := recording.Stop(t, nil)
201156
require.NoError(t, err)

sdk/messaging/azwebpubsub/client_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ import (
1515
"testing"
1616

1717
"github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming"
18-
"github.com/Azure/azure-sdk-for-go/sdk/internal/recording"
1918
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azwebpubsub"
2019
"github.com/golang-jwt/jwt"
2120
"github.com/stretchr/testify/require"
2221
)
2322

2423
func TestClient_SendToAll(t *testing.T) {
25-
if recording.GetRecordMode() == recording.PlaybackMode {
26-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
27-
}
2824
client := newClientWrapper(t)
2925
hub := "hub1"
3026
_, err := client.SendToAll(context.Background(), hub,
@@ -44,9 +40,6 @@ func TestClient_SendToAll(t *testing.T) {
4440
}
4541

4642
func TestClient_ManagePermissions(t *testing.T) {
47-
if recording.GetRecordMode() == recording.PlaybackMode {
48-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
49-
}
5043
client := newClientWrapper(t)
5144
const hub = "chat"
5245
const conn1 = "conn1"
@@ -62,9 +55,6 @@ func TestClient_ManagePermissions(t *testing.T) {
6255
}
6356

6457
func TestClient_CloseConnections(t *testing.T) {
65-
if recording.GetRecordMode() == recording.PlaybackMode {
66-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
67-
}
6858
client := newClientWrapper(t)
6959
const hub = "chat"
7060
const conn1 = "conn1"

0 commit comments

Comments
 (0)