Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes python 2.7 issue with unicode and strings again! #14216

Merged
merged 2 commits into from
Oct 2, 2020
Merged

fixes python 2.7 issue with unicode and strings again! #14216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fa3076
fixes python 2.7 issue with unicode and strings again!
seankane-msft Oct 2, 2020
dab2659
adding the issue number to the skip statement
seankane-msft Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions ...ure-data-tables/tests/recordings/test_table_entity_cosmos.test_binary_property_value.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
interactions:
- request:
body: '{"TableName": "uttable27241549"}'
body: !!python/unicode '{"TableName": "uttable27241549"}'
headers:
Accept:
- application/json;odata=minimalmetadata
Expand All @@ -15,25 +15,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:33 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:33 GMT
x-ms-version:
- '2019-02-02'
method: POST
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables
response:
body:
string: '{"TableName":"uttable27241549","odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables/@Element"}'
string: !!python/unicode '{"TableName":"uttable27241549","odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables/@Element"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
etag:
- W/"datetime'2020-10-01T01%3A07%3A35.9108103Z'"
- W/"datetime'2020-10-02T19%3A58%3A35.3412103Z'"
location:
- https://tablestestcosmosname.table.cosmos.azure.com/Tables('uttable27241549')
server:
Expand All @@ -44,9 +44,9 @@ interactions:
code: 201
message: Ok
- request:
body: '{"PartitionKey": "pk27241549", "PartitionKey@odata.type": "Edm.String",
"RowKey": "rk27241549", "RowKey@odata.type": "Edm.String", "binary": "AQIDBAUGBwgJCg==",
"binary@odata.type": "Edm.Binary"}'
body: !!python/unicode '{"binary": "AQIDBAUGBwgJCg==", "RowKey@odata.type": "Edm.String",
"PartitionKey@odata.type": "Edm.String", "RowKey": "rk27241549", "PartitionKey":
"pk27241549", "binary@odata.type": "Edm.Binary"}'
headers:
Accept:
- application/json;odata=minimalmetadata
Expand All @@ -61,25 +61,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
x-ms-version:
- '2019-02-02'
method: POST
uri: https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549
response:
body:
string: '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549/$metadata#uttable27241549/@Element","odata.etag":"W/\"datetime''2020-10-01T01%3A07%3A36.3953671Z''\"","PartitionKey":"pk27241549","RowKey":"rk27241549","binary@odata.type":"Edm.Binary","binary":"AQIDBAUGBwgJCg==","Timestamp":"2020-10-01T01:07:36.3953671Z"}'
string: !!python/unicode '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549/$metadata#uttable27241549/@Element","odata.etag":"W/\"datetime''2020-10-02T19%3A58%3A35.8906887Z''\"","binary@odata.type":"Edm.Binary","binary":"AQIDBAUGBwgJCg==","RowKey":"rk27241549","PartitionKey":"pk27241549","Timestamp":"2020-10-02T19:58:35.8906887Z"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
etag:
- W/"datetime'2020-10-01T01%3A07%3A36.3953671Z'"
- W/"datetime'2020-10-02T19%3A58%3A35.8906887Z'"
location:
- https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549(PartitionKey='pk27241549',RowKey='rk27241549')
server:
Expand All @@ -101,25 +101,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
x-ms-version:
- '2019-02-02'
method: GET
uri: https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549(PartitionKey='pk27241549',RowKey='rk27241549')
response:
body:
string: '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549/$metadata#uttable27241549/@Element","odata.etag":"W/\"datetime''2020-10-01T01%3A07%3A36.3953671Z''\"","PartitionKey":"pk27241549","RowKey":"rk27241549","binary@odata.type":"Edm.Binary","binary":"AQIDBAUGBwgJCg==","Timestamp":"2020-10-01T01:07:36.3953671Z"}'
string: !!python/unicode '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable27241549/$metadata#uttable27241549/@Element","odata.etag":"W/\"datetime''2020-10-02T19%3A58%3A35.8906887Z''\"","binary@odata.type":"Edm.Binary","binary":"AQIDBAUGBwgJCg==","RowKey":"rk27241549","PartitionKey":"pk27241549","Timestamp":"2020-10-02T19:58:35.8906887Z"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
etag:
- W/"datetime'2020-10-01T01%3A07%3A36.3953671Z'"
- W/"datetime'2020-10-02T19%3A58%3A35.8906887Z'"
server:
- Microsoft-HTTPAPI/2.0
transfer-encoding:
Expand All @@ -139,23 +139,23 @@ interactions:
Content-Length:
- '0'
Date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:35 GMT
x-ms-version:
- '2019-02-02'
method: DELETE
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables('uttable27241549')
response:
body:
string: ''
string: !!python/unicode
headers:
content-length:
- '0'
date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:36 GMT
server:
- Microsoft-HTTPAPI/2.0
status:
Expand All @@ -173,23 +173,23 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:36 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:36 GMT
- Fri, 02 Oct 2020 19:58:36 GMT
x-ms-version:
- '2019-02-02'
method: GET
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables
response:
body:
string: '{"value":[{"TableName":"listtable33a8d15b3"},{"TableName":"listtable13a8d15b3"},{"TableName":"listtable0d2351374"},{"TableName":"pytableasync52bb107b"},{"TableName":"listtable23a8d15b3"},{"TableName":"listtable2d2351374"},{"TableName":"listtable03a8d15b3"},{"TableName":"listtable3d2351374"},{"TableName":"listtable1d2351374"}],"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables"}'
string: !!python/unicode '{"value":[],"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:35 GMT
- Fri, 02 Oct 2020 19:58:36 GMT
server:
- Microsoft-HTTPAPI/2.0
transfer-encoding:
Expand Down
83 changes: 42 additions & 41 deletions ...ables/azure-data-tables/tests/recordings/test_table_entity_cosmos.test_delete_entity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
interactions:
- request:
body: '{"TableName": "uttable87c311d3"}'
body: !!python/unicode '{"TableName": "uttable87c311d3"}'
headers:
Accept:
- application/json;odata=minimalmetadata
Expand All @@ -15,25 +15,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:51 GMT
- Fri, 02 Oct 2020 19:58:51 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:51 GMT
- Fri, 02 Oct 2020 19:58:51 GMT
x-ms-version:
- '2019-02-02'
method: POST
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables
response:
body:
string: '{"TableName":"uttable87c311d3","odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables/@Element"}'
string: !!python/unicode '{"TableName":"uttable87c311d3","odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables/@Element"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
etag:
- W/"datetime'2020-10-01T01%3A07%3A52.2652167Z'"
- W/"datetime'2020-10-02T19%3A58%3A52.6115847Z'"
location:
- https://tablestestcosmosname.table.cosmos.azure.com/Tables('uttable87c311d3')
server:
Expand All @@ -44,13 +44,14 @@ interactions:
code: 201
message: Ok
- request:
body: '{"PartitionKey": "pk87c311d3", "PartitionKey@odata.type": "Edm.String",
"RowKey": "rk87c311d3", "RowKey@odata.type": "Edm.String", "age": 39, "sex":
"male", "sex@odata.type": "Edm.String", "married": true, "deceased": false,
"ratio": 3.1, "evenratio": 3.0, "large": 933311100, "Birthday": "1973-10-04T00:00:00Z",
"Birthday@odata.type": "Edm.DateTime", "birthday": "1970-10-04T00:00:00Z", "birthday@odata.type":
"Edm.DateTime", "binary": "YmluYXJ5", "binary@odata.type": "Edm.Binary", "other":
20, "clsid": "c9da6455-213d-42c9-9a79-3e9149a57833", "clsid@odata.type": "Edm.Guid"}'
body: !!python/unicode '{"binary": "YmluYXJ5", "binary@odata.type": "Edm.Binary",
"PartitionKey": "pk87c311d3", "ratio": 3.1, "RowKey@odata.type": "Edm.String",
"sex@odata.type": "Edm.String", "PartitionKey@odata.type": "Edm.String", "age":
39, "married": true, "sex": "male", "large": 933311100, "Birthday@odata.type":
"Edm.DateTime", "birthday": "1970-10-04T00:00:00Z", "evenratio": 3.0, "clsid":
"c9da6455-213d-42c9-9a79-3e9149a57833", "RowKey": "rk87c311d3", "Birthday":
"1973-10-04T00:00:00Z", "clsid@odata.type": "Edm.Guid", "other": 20, "birthday@odata.type":
"Edm.DateTime", "deceased": false}'
headers:
Accept:
- application/json;odata=minimalmetadata
Expand All @@ -65,25 +66,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
x-ms-version:
- '2019-02-02'
method: POST
uri: https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3
response:
body:
string: '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3/$metadata#uttable87c311d3/@Element","odata.etag":"W/\"datetime''2020-10-01T01%3A07%3A52.7401479Z''\"","PartitionKey":"pk87c311d3","RowKey":"rk87c311d3","age":39,"sex":"male","married":true,"deceased":false,"ratio":3.1,"evenratio":3.0,"large":933311100,"Birthday@odata.type":"Edm.DateTime","Birthday":"1973-10-04T00:00:00.0000000Z","birthday@odata.type":"Edm.DateTime","birthday":"1970-10-04T00:00:00.0000000Z","binary@odata.type":"Edm.Binary","binary":"YmluYXJ5","other":20,"clsid@odata.type":"Edm.Guid","clsid":"c9da6455-213d-42c9-9a79-3e9149a57833","Timestamp":"2020-10-01T01:07:52.7401479Z"}'
string: !!python/unicode '{"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3/$metadata#uttable87c311d3/@Element","odata.etag":"W/\"datetime''2020-10-02T19%3A58%3A53.1139591Z''\"","binary@odata.type":"Edm.Binary","binary":"YmluYXJ5","PartitionKey":"pk87c311d3","ratio":3.1,"age":39,"married":true,"sex":"male","large":933311100,"birthday@odata.type":"Edm.DateTime","birthday":"1970-10-04T00:00:00.0000000Z","evenratio":3.0,"clsid@odata.type":"Edm.Guid","clsid":"c9da6455-213d-42c9-9a79-3e9149a57833","RowKey":"rk87c311d3","Birthday@odata.type":"Edm.DateTime","Birthday":"1973-10-04T00:00:00.0000000Z","other":20,"deceased":false,"Timestamp":"2020-10-02T19:58:53.1139591Z"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
etag:
- W/"datetime'2020-10-01T01%3A07%3A52.7401479Z'"
- W/"datetime'2020-10-02T19%3A58%3A53.1139591Z'"
location:
- https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3(PartitionKey='pk87c311d3',RowKey='rk87c311d3')
server:
Expand All @@ -107,25 +108,25 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
If-Match:
- '*'
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
x-ms-version:
- '2019-02-02'
method: DELETE
uri: https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3(PartitionKey='pk87c311d3',RowKey='rk87c311d3')
response:
body:
string: ''
string: !!python/unicode
headers:
content-length:
- '0'
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
server:
- Microsoft-HTTPAPI/2.0
status:
Expand All @@ -143,24 +144,24 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
x-ms-version:
- '2019-02-02'
method: GET
uri: https://tablestestcosmosname.table.cosmos.azure.com/uttable87c311d3(PartitionKey='pk87c311d3',RowKey='rk87c311d3')
response:
body:
string: "{\"odata.error\":{\"code\":\"ResourceNotFound\",\"message\":{\"lang\":\"en-us\",\"value\":\"The
specified resource does not exist.\\nRequestID:87f4553d-0382-11eb-81ff-58961df361d1\\n\"}}}\r\n"
string: !!python/unicode "{\"odata.error\":{\"code\":\"ResourceNotFound\",\"message\":{\"lang\":\"en-us\",\"value\":\"The
specified resource does not exist.\\nRequestID:b241cd40-04e9-11eb-8c52-58961df361d1\\n\"}}}\r\n"
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:52 GMT
server:
- Microsoft-HTTPAPI/2.0
transfer-encoding:
Expand All @@ -180,23 +181,23 @@ interactions:
Content-Length:
- '0'
Date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
x-ms-version:
- '2019-02-02'
method: DELETE
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables('uttable87c311d3')
response:
body:
string: ''
string: !!python/unicode
headers:
content-length:
- '0'
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
server:
- Microsoft-HTTPAPI/2.0
status:
Expand All @@ -214,23 +215,23 @@ interactions:
DataServiceVersion:
- '3.0'
Date:
- Thu, 01 Oct 2020 01:07:53 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
User-Agent:
- azsdk-python-data-tables/12.0.0b2 Python/3.8.4 (Windows-10-10.0.19041-SP0)
- azsdk-python-data-tables/12.0.0b2 Python/2.7.18 (Windows-10-10.0.19041)
x-ms-date:
- Thu, 01 Oct 2020 01:07:53 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
x-ms-version:
- '2019-02-02'
method: GET
uri: https://tablestestcosmosname.table.cosmos.azure.com/Tables
response:
body:
string: '{"value":[{"TableName":"listtable33a8d15b3"},{"TableName":"listtable13a8d15b3"},{"TableName":"listtable0d2351374"},{"TableName":"pytableasync52bb107b"},{"TableName":"listtable23a8d15b3"},{"TableName":"listtable2d2351374"},{"TableName":"listtable03a8d15b3"},{"TableName":"listtable3d2351374"},{"TableName":"listtable1d2351374"}],"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables"}'
string: !!python/unicode '{"value":[],"odata.metadata":"https://tablestestcosmosname.table.cosmos.azure.com/$metadata#Tables"}'
headers:
content-type:
- application/json;odata=minimalmetadata
date:
- Thu, 01 Oct 2020 01:07:52 GMT
- Fri, 02 Oct 2020 19:58:53 GMT
server:
- Microsoft-HTTPAPI/2.0
transfer-encoding:
Expand Down
Loading