Skip to content

Fix file and queue failure tests after sas token changes. #5535

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

Merged
alzimmermsft merged 3 commits into from
Sep 26, 2019
Merged

Fix file and queue failure tests after sas token changes. #5535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
086724c
Remove unnessary changes
sima-zhu Sep 25, 2019
4df7196
Added file and samples changes
sima-zhu Sep 25, 2019
b1aaeed
Minor fix
sima-zhu Sep 25, 2019
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
12 changes: 0 additions & 12 deletions sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAPITests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,6 @@ class DirectoryAPITests extends APISpec {
FileTestHelper.assertResponseStatusCode(primaryDirectoryClient.createWithResponse(null, null, testMetadata, null, null), 201)
}

def "Create directory error with metadata"() {
given:
def errorMetadata = Collections.singletonMap("testMeta", "value")

when:
primaryDirectoryClient.createWithResponse(null, null, errorMetadata, null, null)

then:
def e = thrown(StorageException)
FileTestHelper.assertExceptionStatusCodeAndMessage(e, 403, StorageErrorCode.AUTHENTICATION_FAILED)
}

def "Create directory with file permission"() {
when:
def resp = primaryDirectoryClient.createWithResponse(null, filePermission, null, null, null)
Expand Down
11 changes: 0 additions & 11 deletions ...age/azure-storage-file/src/test/java/com/azure/storage/file/DirectoryAsyncAPITests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,6 @@ class DirectoryAsyncAPITests extends APISpec {
}.verifyComplete()
}

def "Create directory error with metadata"() {
given:
def errorMetadata = Collections.singletonMap("testMeta", "value")
when:
def createMetadataErrorVerifier = StepVerifier.create(primaryDirectoryAsyncClient.createWithResponse(null, null, errorMetadata))
then:
createMetadataErrorVerifier.verifyErrorSatisfies {
assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, 403, StorageErrorCode.AUTHENTICATION_FAILED)
}
}

def "Create directory with file permission"() {
expect:
StepVerifier.create(primaryDirectoryAsyncClient.createWithResponse(null, filePermission, testMetadata))
Expand Down
10 changes: 2 additions & 8 deletions sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAPITests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,12 @@ class FileAPITests extends APISpec {
resp.getValue().getSmbProperties().getFileId()
}

@Unroll
def "Create file with args error"() {
when:
primaryFileClient.createWithResponse(maxSize, null, null, null, metadata, null, null)
primaryFileClient.createWithResponse(-1, null, null, null, testMetadata, null, null)
then:
def e = thrown(StorageException)
FileTestHelper.assertExceptionStatusCodeAndMessage(e, statusCode, errMsg)

where:
maxSize | metadata | statusCode | errMsg
-1 | testMetadata | 400 | StorageErrorCode.OUT_OF_RANGE_INPUT
1024 | Collections.singletonMap("testMeta", "value") | 403 | StorageErrorCode.AUTHENTICATION_FAILED
FileTestHelper.assertExceptionStatusCodeAndMessage(e, 400, StorageErrorCode.OUT_OF_RANGE_INPUT)
}

@Unroll
Expand Down
10 changes: 2 additions & 8 deletions sdk/storage/azure-storage-file/src/test/java/com/azure/storage/file/FileAsyncAPITests.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,20 +126,14 @@ class FileAsyncAPITests extends APISpec {
}.verifyComplete()
}

@Unroll
def "Create file with args error"() {
when:
def createFileErrorVerifier = StepVerifier.create(primaryFileAsyncClient.createWithResponse(maxSize, null, null, null, metadata))
def createFileErrorVerifier = StepVerifier.create(primaryFileAsyncClient.createWithResponse(-1, null, null, null, testMetadata))

then:
createFileErrorVerifier.verifyErrorSatisfies {
assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, statusCode, errMsg)
assert FileTestHelper.assertExceptionStatusCodeAndMessage(it, 400, StorageErrorCode.OUT_OF_RANGE_INPUT)
}

where:
maxSize | metadata | statusCode | errMsg
-1 | testMetadata | 400 | StorageErrorCode.OUT_OF_RANGE_INPUT
1024 | Collections.singletonMap("testMeta", "value") | 403 | StorageErrorCode.AUTHENTICATION_FAILED
}

def "Upload and download data"() {
Expand Down
45 changes: 0 additions & 45 deletions ...src/test/resources/session-records/DirectoryAPITestsCreateDirectoryErrorWithMetadata.json
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ...est/resources/session-records/DirectoryAsyncAPITestsCreateDirectoryErrorWithMetadata.json
View file
Open in desktop

This file was deleted.

47 changes: 47 additions & 0 deletions ...-storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"networkCallRecords" : [ {
"Method" : "PUT",
"Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror978624594149f00?restype=share",
"Headers" : {
"x-ms-version" : "2019-02-02",
"User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
"x-ms-client-request-id" : "f66131a7-a3d8-49f6-908f-968d001cd1da"
},
"Response" : {
"x-ms-version" : "2019-02-02",
"Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
"ETag" : "\"0x8D742088ADDA724\"",
"Last-Modified" : "Wed, 25 Sep 2019 22:34:35 GMT",
"retry-after" : "0",
"Content-Length" : "0",
"StatusCode" : "201",
"x-ms-request-id" : "b438eb56-101a-0066-34f1-73822c000000",
"Date" : "Wed, 25 Sep 2019 22:34:35 GMT",
"x-ms-client-request-id" : "f66131a7-a3d8-49f6-908f-968d001cd1da"
},
"Exception" : null
}, {
"Method" : "PUT",
"Uri" : "https://azstoragesdkaccount.file.core.windows.net/fileapitestscreatefilewithargserror978624594149f00/fileapitestscreatefilewithargserror56311c9a58e7aa5",
"Headers" : {
"x-ms-version" : "2019-02-02",
"User-Agent" : "azsdk-java-azure-storage-file/12.0.0-preview.4 1.8.0_222; Windows 10 10.0",
"x-ms-client-request-id" : "1f7f69d0-9caa-4fa8-a6ce-a41a5a552f97"
},
"Response" : {
"x-ms-version" : "2019-02-02",
"Server" : "Windows-Azure-File/1.0 Microsoft-HTTPAPI/2.0",
"x-ms-error-code" : "OutOfRangeInput",
"retry-after" : "0",
"Content-Length" : "236",
"StatusCode" : "400",
"x-ms-request-id" : "b438eb5a-101a-0066-36f1-73822c000000",
"Body" : "<?xml version=\"1.0\" encoding=\"utf-8\"?><Error><Code>OutOfRangeInput</Code><Message>The file size exceeds the maximum permissible limit.\nRequestId:b438eb5a-101a-0066-36f1-73822c000000\nTime:2019-09-25T22:34:35.4979914Z</Message></Error>",
"Date" : "Wed, 25 Sep 2019 22:34:35 GMT",
"x-ms-client-request-id" : "1f7f69d0-9caa-4fa8-a6ce-a41a5a552f97",
"Content-Type" : "application/xml"
},
"Exception" : null
} ],
"variables" : [ "fileapitestscreatefilewithargserror978624594149f00", "fileapitestscreatefilewithargserror56311c9a58e7aa5" ]
}
47 changes: 0 additions & 47 deletions ...storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError0.json
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ...storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError1.json
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions ...storage-file/src/test/resources/session-records/FileAPITestsCreateFileWithArgsError2.json
View file
Open in desktop

This file was deleted.

Loading