Skip to content

Commit 01ab6a1

Browse files
vincenttran-msftvincenttran-msft
authored
Fixed expected output (Azure#24118)
1 parent 72ed8a2 commit 01ab6a1

File tree

4 files changed

+236
-175
lines changed

4 files changed

+236
-175
lines changed

‎sdk/storage/azure-storage-blob/tests/recordings/test_quick_query.test_quick_query_output_in_arrow_format.yaml

Lines changed: 76 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,37 @@ interactions:
33
body: null
44
headers:
55
Accept:
6-
- '*/*'
6+
- application/xml
77
Accept-Encoding:
88
- gzip, deflate
99
Connection:
1010
- keep-alive
1111
Content-Length:
1212
- '0'
1313
User-Agent:
14-
- azsdk-python-storage-blob/12.4.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
14+
- azsdk-python-storage-blob/12.12.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)
1515
x-ms-date:
16-
- Fri, 11 Sep 2020 20:58:27 GMT
16+
- Wed, 20 Apr 2022 23:29:58 GMT
1717
x-ms-version:
18-
- '2020-02-10'
18+
- '2021-06-08'
1919
method: PUT
2020
uri: https://storagename.blob.core.windows.net/utqqcontainer9d4d1789?restype=container
2121
response:
2222
body:
2323
string: ''
2424
headers:
25+
content-length:
26+
- '0'
2527
date:
26-
- Fri, 11 Sep 2020 20:58:28 GMT
28+
- Wed, 20 Apr 2022 23:29:58 GMT
2729
etag:
28-
- '"0x8D856956EBF3C36"'
30+
- '"0x8DA2325AF8B4A1C"'
2931
last-modified:
30-
- Fri, 11 Sep 2020 20:58:28 GMT
31-
transfer-encoding:
32-
- chunked
32+
- Wed, 20 Apr 2022 23:29:59 GMT
33+
server:
34+
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
3335
x-ms-version:
34-
- '2020-02-10'
36+
- '2021-06-08'
3537
status:
3638
code: 201
3739
message: Created
@@ -43,7 +45,7 @@ interactions:
4345
'
4446
headers:
4547
Accept:
46-
- '*/*'
48+
- application/xml
4749
Accept-Encoding:
4850
- gzip, deflate
4951
Connection:
@@ -53,35 +55,37 @@ interactions:
5355
Content-Type:
5456
- application/octet-stream
5557
User-Agent:
56-
- azsdk-python-storage-blob/12.4.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
58+
- azsdk-python-storage-blob/12.12.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)
5759
x-ms-blob-type:
5860
- BlockBlob
5961
x-ms-date:
60-
- Fri, 11 Sep 2020 20:58:28 GMT
62+
- Wed, 20 Apr 2022 23:29:59 GMT
6163
x-ms-version:
62-
- '2020-02-10'
64+
- '2021-06-08'
6365
method: PUT
6466
uri: https://storagename.blob.core.windows.net/utqqcontainer9d4d1789/csvfile9d4d1789
6567
response:
6668
body:
6769
string: ''
6870
headers:
71+
content-length:
72+
- '0'
6973
content-md5:
7074
- /hmKXD7m7tyfn12eEsFvyQ==
7175
date:
72-
- Fri, 11 Sep 2020 20:58:28 GMT
76+
- Wed, 20 Apr 2022 23:29:58 GMT
7377
etag:
74-
- '"0x8D856956ED0E86F"'
78+
- '"0x8DA2325AFA46972"'
7579
last-modified:
76-
- Fri, 11 Sep 2020 20:58:28 GMT
77-
transfer-encoding:
78-
- chunked
80+
- Wed, 20 Apr 2022 23:29:59 GMT
81+
server:
82+
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
7983
x-ms-content-crc64:
8084
- Dn1U+tgM/4c=
8185
x-ms-request-server-encrypted:
82-
- 'false'
86+
- 'true'
8387
x-ms-version:
84-
- '2020-02-10'
88+
- '2021-06-08'
8589
status:
8690
code: 201
8791
message: Created
@@ -100,19 +104,19 @@ interactions:
100104
Content-Length:
101105
- '390'
102106
Content-Type:
103-
- application/xml; charset=utf-8
107+
- application/xml
104108
User-Agent:
105-
- azsdk-python-storage-blob/12.4.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
109+
- azsdk-python-storage-blob/12.12.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)
106110
x-ms-date:
107-
- Fri, 11 Sep 2020 20:58:28 GMT
111+
- Wed, 20 Apr 2022 23:29:59 GMT
108112
x-ms-version:
109-
- '2020-02-10'
113+
- '2021-06-08'
110114
method: POST
111115
uri: https://storagename.blob.core.windows.net/utqqcontainer9d4d1789/csvfile9d4d1789?comp=query
112116
response:
113117
body:
114118
string: !!binary |
115-
T2JqAQIWYXZyby5zY2hlbWG+HlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUi
119+
T2JqAQIWYXZyby5zY2hlbWHOHlsKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAgIm5hbWUi
116120
OiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLnJlc3VsdERh
117121
dGEiLAogICAgImRvYyI6ICJIb2xkcyByZXN1bHQgZGF0YSBpbiB0aGUgZm9ybWF0IHNwZWNpZmll
118122
ZCBmb3IgdGhpcyBxdWVyeSAoQ1NWLCBKU09OLCBldGMuKS4iLAogICAgImZpZWxkcyI6IFsKICAg
@@ -131,86 +135,90 @@ interactions:
131135
Im5hbWUiOiAiZGVzY3JpcHRpb24iLAogICAgICAgICJ0eXBlIjogInN0cmluZyIsCiAgICAgICAg
132136
ImRvYyI6ICJBIGRlc2NyaXB0aW9uIG9mIHRoZSBlcnJvciIKICAgICAgfSwKICAgICAgewogICAg
133137
ICAgICJuYW1lIjogInBvc2l0aW9uIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAgICAi
134-
ZG9jIjogIlRoZSBibG9iIG9mZnNldCBhdCB3aGljaCB0aGUgZXJyb3Igb2NjdXJyZWQiCiAgICAg
135-
IH0KICAgIF0KICB9LAogIHsKICAgICJ0eXBlIjogInJlY29yZCIsCiAgICAibmFtZSI6ICJjb20u
136-
bWljcm9zb2Z0LmF6dXJlLnN0b3JhZ2UucXVlcnlCbG9iQ29udGVudHMucHJvZ3Jlc3MiLAogICAg
137-
ImRvYyI6ICJJbmZvcm1hdGlvbiBhYm91dCB0aGUgcHJvZ3Jlc3Mgb2YgdGhlIHF1ZXJ5IiwKICAg
138-
ICJmaWVsZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJieXRlc1NjYW5uZWQiLAogICAg
139-
ICAgICJ0eXBlIjogImxvbmciLAogICAgICAgICJkb2MiOiAiVGhlIG51bWJlciBvZiBieXRlcyB0
140-
aGF0IGhhdmUgYmVlbiBzY2FubmVkIgogICAgICB9LAogICAgICB7CiAgICAgICAgIm5hbWUiOiAi
141-
dG90YWxCeXRlcyIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUg
142-
dG90YWwgbnVtYmVyIG9mIGJ5dGVzIHRvIGJlIHNjYW5uZWQgaW4gdGhpcyBxdWVyeSIKICAgICAg
143-
fQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAgICJuYW1lIjogImNvbS5t
144-
aWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5lbmQiLAogICAgImRvYyI6
145-
ICJTZW50IGFzIHRoZSBmaW5hbCBtZXNzYWdlIG9mIHRoZSByZXNwb25zZSwgaW5kaWNhdGluZyB0
146-
aGF0IGFsbCByZXN1bHRzIGhhdmUgYmVlbiBzZW50LiIsCiAgICAiZmllbGRzIjogWwogICAgICB7
147-
CiAgICAgICAgIm5hbWUiOiAidG90YWxCeXRlcyIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAg
148-
ICAgICAgImRvYyI6ICJUaGUgdG90YWwgbnVtYmVyIG9mIGJ5dGVzIHRvIGJlIHNjYW5uZWQgaW4g
149-
dGhpcyBxdWVyeSIKICAgICAgfQogICAgXQogIH0KXQoAQmgjmNsu90Ck/YQ3d6WMowL2AwDwA///
150-
//94AAAAEAAAAAAACgAMAAYABQAIAAoAAAAAAQMADAAAAAgACAAAAAQACAAAAAQAAAABAAAAFAAA
151-
ABAAFAAIAAYABwAMAAAAEAAQAAAAAAABByQAAAAUAAAABAAAAAAAAAAIAAwABAAIAAgAAAAEAAAA
152-
AgAAAAMAAABhYmMA/////3AAAAAQAAAAAAAKAA4ABgAFAAgACgAAAAADAwAQAAAAAAAKAAwAAAAE
153-
AAgACgAAADAAAAAEAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEA
154-
AAAAAAAAAAAAAAAAAAAAAAAAQmgjmNsu90Ck/YQ3d6WMowLGAgDAAv////+IAAAAFAAAAAAAAAAM
155-
ABYABgAFAAgADAAMAAAAAAMDABgAAAAQAAAAAAAAAAAACgAYAAwABAAIAAoAAAA8AAAAEAAAAAEA
156-
AAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAABAAAAAQAA
157-
AAAAAAAAAAAAAAAAAJABAAAAAAAAAAAAAAAAAABCaCOY2y73QKT9hDd3pYyjAgYEQEBCaCOY2y73
158-
QKT9hDd3pYyjAgQGQEJoI5jbLvdApP2EN3eljKM=
138+
ZG9jIjogIlRoZSByZWNvcmQgb2Zmc2V0IGluIHRoZSBibG9iIGF0IHdoaWNoIHRoZSBlcnJvciBv
139+
Y2N1cnJlZCIKICAgICAgfQogICAgXQogIH0sCiAgewogICAgInR5cGUiOiAicmVjb3JkIiwKICAg
140+
ICJuYW1lIjogImNvbS5taWNyb3NvZnQuYXp1cmUuc3RvcmFnZS5xdWVyeUJsb2JDb250ZW50cy5w
141+
cm9ncmVzcyIsCiAgICAiZG9jIjogIkluZm9ybWF0aW9uIGFib3V0IHRoZSBwcm9ncmVzcyBvZiB0
142+
aGUgcXVlcnkiLAogICAgImZpZWxkcyI6IFsKICAgICAgewogICAgICAgICJuYW1lIjogImJ5dGVz
143+
U2Nhbm5lZCIsCiAgICAgICAgInR5cGUiOiAibG9uZyIsCiAgICAgICAgImRvYyI6ICJUaGUgbnVt
144+
YmVyIG9mIGJ5dGVzIHRoYXQgaGF2ZSBiZWVuIHNjYW5uZWQiCiAgICAgIH0sCiAgICAgIHsKICAg
145+
ICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlwZSI6ICJsb25nIiwKICAgICAg
146+
ICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgdG8gYmUgc2Nhbm5lZCBpbiB0aGlz
147+
IHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfSwKICB7CiAgICAidHlwZSI6ICJyZWNvcmQiLAogICAg
148+
Im5hbWUiOiAiY29tLm1pY3Jvc29mdC5henVyZS5zdG9yYWdlLnF1ZXJ5QmxvYkNvbnRlbnRzLmVu
149+
ZCIsCiAgICAiZG9jIjogIlNlbnQgYXMgdGhlIGZpbmFsIG1lc3NhZ2Ugb2YgdGhlIHJlc3BvbnNl
150+
LCBpbmRpY2F0aW5nIHRoYXQgYWxsIHJlc3VsdHMgaGF2ZSBiZWVuIHNlbnQuIiwKICAgICJmaWVs
151+
ZHMiOiBbCiAgICAgIHsKICAgICAgICAibmFtZSI6ICJ0b3RhbEJ5dGVzIiwKICAgICAgICAidHlw
152+
ZSI6ICJsb25nIiwKICAgICAgICAiZG9jIjogIlRoZSB0b3RhbCBudW1iZXIgb2YgYnl0ZXMgc2Nh
153+
bm5lZCBpbiB0aGlzIHF1ZXJ5IgogICAgICB9CiAgICBdCiAgfQpdCgDf2hUk81aGQqYRdJ+YtSx3
154+
AoYEAIAE/////3gAAAAQAAAAAAAKAAwABgAFAAgACgAAAAABBAAMAAAACAAIAAAABAAIAAAABAAA
155+
AAEAAAAUAAAAEAAUAAgABgAHAAwAAAAQABAAAAAAAAEHEAAAABwAAAAEAAAAAAAAAAMAAABhYmMA
156+
CAAMAAQACAAIAAAABAAAAAIAAAD/////cAAAABAAAAAAAAoADgAGAAUACAAKAAAAAAMEABAAAAAA
157+
AAoADAAAAAQACAAKAAAAMAAAAAQAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
158+
AAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAD/////AAAAAN/aFSTzVoZCphF0n5i1LHcCxgIAwAL/
159+
////iAAAABQAAAAAAAAADAAWAAYABQAIAAwADAAAAAADBAAYAAAAEAAAAAAAAAAAAAoAGAAMAAQA
160+
CAAKAAAAPAAAABAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAA
161+
AAAAAAAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAACQAQAAAAAAAAAAAAAAAAAA39oVJPNWhkKmEXSf
162+
mLUsdwIGBEBA39oVJPNWhkKmEXSfmLUsdwIEBkDf2hUk81aGQqYRdJ+YtSx3
159163
headers:
160164
accept-ranges:
161165
- bytes
162166
content-type:
163167
- avro/binary
164168
date:
165-
- Fri, 11 Sep 2020 20:58:28 GMT
169+
- Wed, 20 Apr 2022 23:30:20 GMT
166170
etag:
167-
- '"0x8D856956ED0E86F"'
171+
- '"0x8DA2325AFA46972"'
168172
last-modified:
169-
- Fri, 11 Sep 2020 20:58:28 GMT
173+
- Wed, 20 Apr 2022 23:29:59 GMT
174+
server:
175+
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
170176
transfer-encoding:
171177
- chunked
172178
x-ms-blob-type:
173179
- BlockBlob
174180
x-ms-creation-time:
175-
- Fri, 11 Sep 2020 20:58:28 GMT
176-
x-ms-lease-state:
177-
- available
178-
x-ms-lease-status:
179-
- unlocked
181+
- Wed, 20 Apr 2022 23:29:59 GMT
182+
x-ms-resource-type:
183+
- file
184+
x-ms-server-encrypted:
185+
- 'true'
180186
x-ms-version:
181-
- '2020-02-10'
187+
- '2021-06-08'
182188
status:
183189
code: 200
184190
message: OK
185191
- request:
186192
body: null
187193
headers:
188194
Accept:
189-
- '*/*'
195+
- application/xml
190196
Accept-Encoding:
191197
- gzip, deflate
192198
Connection:
193199
- keep-alive
194200
Content-Length:
195201
- '0'
196202
User-Agent:
197-
- azsdk-python-storage-blob/12.4.0 Python/3.7.3 (Windows-10-10.0.19041-SP0)
203+
- azsdk-python-storage-blob/12.12.0 Python/3.10.2 (Windows-10-10.0.19044-SP0)
198204
x-ms-date:
199-
- Fri, 11 Sep 2020 20:58:28 GMT
205+
- Wed, 20 Apr 2022 23:30:23 GMT
200206
x-ms-version:
201-
- '2020-02-10'
207+
- '2021-06-08'
202208
method: DELETE
203209
uri: https://storagename.blob.core.windows.net/utqqcontainer9d4d1789?restype=container
204210
response:
205211
body:
206212
string: ''
207213
headers:
214+
content-length:
215+
- '0'
208216
date:
209-
- Fri, 11 Sep 2020 20:58:28 GMT
210-
transfer-encoding:
211-
- chunked
217+
- Wed, 20 Apr 2022 23:30:27 GMT
218+
server:
219+
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
212220
x-ms-version:
213-
- '2020-02-10'
221+
- '2021-06-08'
214222
status:
215223
code: 202
216224
message: Accepted

‎sdk/storage/azure-storage-blob/tests/test_quick_query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ def on_error(error):
924924
on_error=on_error,
925925
output_format=output_format)
926926
query_result = base64.b64encode(resp.readall())
927-
expected_result = b"/////3gAAAAQAAAAAAAKAAwABgAFAAgACgAAAAABAwAMAAAACAAIAAAABAAIAAAABAAAAAEAAAAUAAAAEAAUAAgABgAHAAwAAAAQABAAAAAAAAEHJAAAABQAAAAEAAAAAAAAAAgADAAEAAgACAAAAAQAAAACAAAAAwAAAGFiYwD/////cAAAABAAAAAAAAoADgAGAAUACAAKAAAAAAMDABAAAAAAAAoADAAAAAQACAAKAAAAMAAAAAQAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAD/////iAAAABQAAAAAAAAADAAWAAYABQAIAAwADAAAAAADAwAYAAAAEAAAAAAAAAAAAAoAGAAMAAQACAAKAAAAPAAAABAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAACQAQAAAAAAAAAAAAAAAAAA"
927+
expected_result = b'/////3gAAAAQAAAAAAAKAAwABgAFAAgACgAAAAABBAAMAAAACAAIAAAABAAIAAAABAAAAAEAAAAUAAAAEAAUAAgABgAHAAwAAAAQABAAAAAAAAEHEAAAABwAAAAEAAAAAAAAAAMAAABhYmMACAAMAAQACAAIAAAABAAAAAIAAAD/////cAAAABAAAAAAAAoADgAGAAUACAAKAAAAAAMEABAAAAAAAAoADAAAAAQACAAKAAAAMAAAAAQAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAD/////AAAAAP////+IAAAAFAAAAAAAAAAMABYABgAFAAgADAAMAAAAAAMEABgAAAAQAAAAAAAAAAAACgAYAAwABAAIAAoAAAA8AAAAEAAAAAEAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAABAAAAAQAAAAAAAAAAAAAAAAAAAJABAAAAAAAAAAAAAAAAAAA='
928928

929929
self.assertEqual(len(errors), 0)
930930
self.assertEqual(query_result, expected_result)

0 commit comments

Comments
 (0)