Skip to content

Commit bac44f3

Browse files
tanyasethi-msfttanyasethi-msft
authored
Blob, Files - Tests refactor after testproxy update (Azure#22914)
* test changes after test proxy updates * recordings of blob and files * test name typo * azfile test updates and recordings * azfile, azblob test updates and recordings * azblob recordings * azblob test updates and recordings * recording * blob recording * blob - playback mode changes * go sum entry missing
1 parent 50917d6 commit bac44f3

File tree

13 files changed

+54
-43
lines changed

13 files changed

+54
-43
lines changed

‎sdk/storage/azblob/appendblob/client_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ import (
4343
)
4444

4545
func Test(t *testing.T) {
46-
if recording.GetRecordMode() == recording.PlaybackMode {
47-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
48-
}
4946
recordMode := recording.GetRecordMode()
5047
t.Logf("Running appendblob Tests in %s mode\n", recordMode)
5148
if recordMode == recording.LiveMode {
@@ -1274,11 +1271,11 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendSetImmutabilityPolicy() {
12741271

12751272
currentTime, err := time.Parse(time.UnixDate, "Fri Jun 11 20:00:00 GMT 2049")
12761273
_require.NoError(err)
1277-
policy := blob.ImmutabilityPolicySetting(blob.ImmutabilityPolicySettingUnlocked)
1274+
immutabilityPolicySetting := blob.ImmutabilityPolicySetting(blob.ImmutabilityPolicySettingUnlocked)
12781275
_require.NoError(err)
12791276

12801277
setImmutabilityPolicyOptions := &blob.SetImmutabilityPolicyOptions{
1281-
Mode: &policy,
1278+
Mode: &immutabilityPolicySetting,
12821279
ModifiedAccessConditions: nil,
12831280
}
12841281
_, err = abClient.SetImmutabilityPolicy(context.Background(), currentTime, setImmutabilityPolicyOptions)
@@ -1313,11 +1310,11 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendDeleteImmutabilityPolicy() {
13131310
currentTime, err := time.Parse(time.UnixDate, "Fri Jun 11 20:00:00 GMT 2049")
13141311
_require.NoError(err)
13151312

1316-
policy := blob.ImmutabilityPolicySetting(blob.ImmutabilityPolicySettingUnlocked)
1313+
immutabilityPolicySetting := blob.ImmutabilityPolicySetting(blob.ImmutabilityPolicySettingUnlocked)
13171314
_require.NoError(err)
13181315

13191316
setImmutabilityPolicyOptions := &blob.SetImmutabilityPolicyOptions{
1320-
Mode: &policy,
1317+
Mode: &immutabilityPolicySetting,
13211318
ModifiedAccessConditions: nil,
13221319
}
13231320
_, err = abClient.SetImmutabilityPolicy(context.Background(), currentTime, setImmutabilityPolicyOptions)
@@ -2254,7 +2251,9 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendBlockWithCPK() {
22542251
_require.NotNil(resp.Date)
22552252
_require.Equal((*resp.Date).IsZero(), false)
22562253
_require.Equal(*resp.IsServerEncrypted, true)
2257-
_require.EqualValues(resp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
2254+
if recording.GetRecordMode() != recording.PlaybackMode {
2255+
_require.EqualValues(resp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
2256+
}
22582257
}
22592258

22602259
// Get blob content without encryption key should fail the request.
@@ -2271,7 +2270,9 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendBlockWithCPK() {
22712270
data, err := io.ReadAll(downloadResp.Body)
22722271
_require.NoError(err)
22732272
_require.EqualValues(string(data), "AAA BBB CCC ")
2274-
_require.EqualValues(*downloadResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
2273+
if recording.GetRecordMode() != recording.PlaybackMode {
2274+
_require.EqualValues(*downloadResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
2275+
}
22752276
}
22762277

22772278
func (s *AppendBlobRecordedTestsSuite) TestAppendBlockWithCPKScope() {
@@ -2290,7 +2291,6 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendBlockWithCPKScope() {
22902291
}
22912292
_, err = abClient.Create(context.Background(), &createAppendBlobOptions)
22922293
_require.NoError(err)
2293-
// _require.Equal(resp.RawResponse.StatusCode, 201)
22942294

22952295
words := []string{"AAA ", "BBB ", "CCC "}
22962296
for index, word := range words {
@@ -2299,7 +2299,6 @@ func (s *AppendBlobRecordedTestsSuite) TestAppendBlockWithCPKScope() {
22992299
}
23002300
resp, err := abClient.AppendBlock(context.Background(), streaming.NopCloser(strings.NewReader(word)), &appendBlockOptions)
23012301
_require.NoError(err)
2302-
// _require.Equal(resp.RawResponse.StatusCode, 201)
23032302
_require.Equal(*resp.BlobAppendOffset, strconv.Itoa(index*4))
23042303
_require.Equal(*resp.BlobCommittedBlockCount, int32(index+1))
23052304
_require.NotNil(resp.ETag)

‎sdk/storage/azblob/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/storage/azblob",
5-
"Tag": "go/storage/azblob_71b0a04c12"
5+
"Tag": "go/storage/azblob_bbf7a929e3"
66
}

‎sdk/storage/azblob/blockblob/client_test.go‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ import (
4949
var proposedLeaseIDs = []*string{to.Ptr("c820a799-76d7-4ee2-6e15-546f19325c2c"), to.Ptr("326cc5e1-746e-4af8-4811-a50e6629a8ca")}
5050

5151
func Test(t *testing.T) {
52-
if recording.GetRecordMode() == recording.PlaybackMode {
53-
t.Skip("https://github.com/Azure/azure-sdk-for-go/issues/22869")
54-
}
5552
recordMode := recording.GetRecordMode()
5653
t.Logf("Running blockblob Tests in %s mode\n", recordMode)
5754
if recordMode == recording.LiveMode {
@@ -1174,7 +1171,9 @@ func (s *BlockBlobUnrecordedTestsSuite) TestPutBlobFromUrlWithCPK() {
11741171

11751172
getResp, err := destBlob.GetProperties(context.Background(), &getBlobPropertiesOptions)
11761173
_require.NoError(err)
1177-
_require.EqualValues(getResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
1174+
if recording.GetRecordMode() != recording.PlaybackMode {
1175+
_require.EqualValues(getResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
1176+
}
11781177
}
11791178

11801179
func (s *BlockBlobUnrecordedTestsSuite) TestPutBlobFromUrlCPKScope() {
@@ -3093,7 +3092,9 @@ func (s *BlockBlobRecordedTestsSuite) TestGetSetBlobMetadataWithCPK() {
30933092
}
30943093
resp, err := bbClient.SetMetadata(context.Background(), testcommon.BasicMetadata, &setBlobMetadataOptions)
30953094
_require.NoError(err)
3096-
_require.EqualValues(resp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
3095+
if recording.GetRecordMode() != recording.PlaybackMode {
3096+
_require.EqualValues(resp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
3097+
}
30973098

30983099
// Get blob properties without encryption key should fail the request.
30993100
_, err = bbClient.GetProperties(context.Background(), nil)
@@ -3187,8 +3188,9 @@ func (s *BlockBlobRecordedTestsSuite) TestBlobSnapshotWithCPK() {
31873188
}
31883189
dResp, err := snapshotURL.DownloadStream(context.Background(), &downloadBlobOptions)
31893190
_require.NoError(err)
3190-
_require.EqualValues(*dResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
3191-
3191+
if recording.GetRecordMode() != recording.PlaybackMode {
3192+
_require.EqualValues(*dResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
3193+
}
31923194
_, err = snapshotURL.Delete(context.Background(), nil)
31933195
_require.NoError(err)
31943196

@@ -4421,7 +4423,9 @@ func (s *BlockBlobRecordedTestsSuite) TestPutBlockAndPutBlockListWithCPK() {
44214423
_require.NotNil(resp.ETag)
44224424
_require.NotNil(resp.LastModified)
44234425
_require.Equal(*resp.IsServerEncrypted, true)
4424-
_require.EqualValues(*resp.EncryptionKeySHA256, *(testcommon.TestCPKByValue.EncryptionKeySHA256))
4426+
if recording.GetRecordMode() != recording.PlaybackMode {
4427+
_require.EqualValues(*resp.EncryptionKeySHA256, *(testcommon.TestCPKByValue.EncryptionKeySHA256))
4428+
}
44254429

44264430
// Get blob content without encryption key should fail the request.
44274431
_, err = bbClient.DownloadStream(context.Background(), nil)
@@ -4787,7 +4791,9 @@ func (s *BlockBlobRecordedTestsSuite) TestUploadBlobWithMD5WithCPK() {
47874791
_require.NoError(err)
47884792
// _require.Equal(uploadResp.RawResponse.StatusCode, 201)
47894793
_require.Equal(*uploadResp.IsServerEncrypted, true)
4790-
_require.EqualValues(uploadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4794+
if recording.GetRecordMode() != recording.PlaybackMode {
4795+
_require.EqualValues(uploadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4796+
}
47914797

47924798
// Get blob content without encryption key should fail the request.
47934799
_, err = bbClient.DownloadStream(context.Background(), nil)
@@ -4807,7 +4813,9 @@ func (s *BlockBlobRecordedTestsSuite) TestUploadBlobWithMD5WithCPK() {
48074813
destData, err := io.ReadAll(downloadResp.Body)
48084814
_require.NoError(err)
48094815
_require.EqualValues(destData, srcData)
4810-
_require.EqualValues(downloadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4816+
if recording.GetRecordMode() != recording.PlaybackMode {
4817+
_require.EqualValues(downloadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4818+
}
48114819
}
48124820

48134821
func (s *BlockBlobRecordedTestsSuite) TestUploadBlobWithMD5WithCPKScope() {

‎sdk/storage/azblob/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2
8-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0
8+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0
1010
github.com/stretchr/testify v1.9.0
1111
)

‎sdk/storage/azblob/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqb
22
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
33
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
44
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2/go.mod h1:aiYBYui4BJ/BJCAIKs92XiPyQfTaBWqvHujDwKb6CBU=
5-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0 h1:rTfKOCZGy5ViVrlA74ZPE99a+SgoEE2K/yg3RyW9dFA=
6-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
5+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
6+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
77
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do=
88
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU=
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=

‎sdk/storage/azblob/internal/testcommon/clients_auth.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,12 @@ func CreateNewBlockBlobWithCPK(ctx context.Context, _require *require.Assertions
265265
}
266266
cResp, err := bbClient.Upload(ctx, streaming.NopCloser(strings.NewReader(BlockBlobDefaultData)), &uploadBlockBlobOptions)
267267
_require.NoError(err)
268-
// _require.Equal(cResp.RawResponse.StatusCode, 201)
268+
269269
_require.Equal(*cResp.IsServerEncrypted, true)
270-
if cpkInfo != nil {
270+
if cpkInfo != nil && recording.GetRecordMode() != recording.PlaybackMode {
271271
_require.EqualValues(cResp.EncryptionKeySHA256, cpkInfo.EncryptionKeySHA256)
272272
}
273-
if cpkScopeInfo != nil {
273+
if cpkScopeInfo != nil && recording.GetRecordMode() != recording.PlaybackMode {
274274
_require.EqualValues(cResp.EncryptionScope, cpkScopeInfo.EncryptionScope)
275275
}
276276
return

‎sdk/storage/azblob/pageblob/client_test.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4028,8 +4028,9 @@ func (s *PageBlobUnrecordedTestsSuite) TestPageBlockWithCPK() {
40284028
}, &uploadPagesOptions)
40294029
_require.NoError(err)
40304030
// _require.Equal(uploadResp.RawResponse.StatusCode, 201)
4031-
_require.EqualValues(uploadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4032-
4031+
if recording.GetRecordMode() != recording.PlaybackMode {
4032+
_require.EqualValues(uploadResp.EncryptionKeySHA256, testcommon.TestCPKByValue.EncryptionKeySHA256)
4033+
}
40334034
pager := pbClient.NewGetPageRangesPager(nil)
40344035
for pager.More() {
40354036
resp, err := pager.NextPage(context.Background())
@@ -4064,7 +4065,9 @@ func (s *PageBlobUnrecordedTestsSuite) TestPageBlockWithCPK() {
40644065
destData, err := io.ReadAll(downloadResp.Body)
40654066
_require.NoError(err)
40664067
_require.EqualValues(destData, srcData)
4067-
_require.EqualValues(*downloadResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
4068+
if recording.GetRecordMode() != recording.PlaybackMode {
4069+
_require.EqualValues(*downloadResp.EncryptionKeySHA256, *testcommon.TestCPKByValue.EncryptionKeySHA256)
4070+
}
40684071
}
40694072

40704073
func (s *PageBlobUnrecordedTestsSuite) TestPageBlockWithCPKScope() {

‎sdk/storage/azblob/testdata/perf/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
7-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0
7+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0
88
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
99
)
1010

‎sdk/storage/azblob/testdata/perf/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM=
22
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
33
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
4-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0 h1:rTfKOCZGy5ViVrlA74ZPE99a+SgoEE2K/yg3RyW9dFA=
5-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.7.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
4+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
5+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
66
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=
77
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
88
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

‎sdk/storage/azfile/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/storage/azfile",
5-
"Tag": "go/storage/azfile_e46f674336"
5+
"Tag": "go/storage/azfile_bd5cdaec91"
66
}

0 commit comments

Comments
 (0)