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

Revert test change - new file handle open on downloadfile #22373

Merged
merged 5 commits into from
Feb 13, 2024
Merged

Revert test change - new file handle open on downloadfile #22373

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c17c92e
revert new file handle open change on downloadfile
tanyasethi-msft Feb 10, 2024
d439cfe
revert new file handle open change on downloadfile
tanyasethi-msft Feb 13, 2024
4c7b4fa
azblob, azcore. azidentity dependancy updates
tanyasethi-msft Feb 13, 2024
8687962
changelog updates
tanyasethi-msft Feb 13, 2024
c19d293
changelog updates
tanyasethi-msft Feb 13, 2024
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
72 changes: 17 additions & 55 deletions sdk/storage/azdatalake/file/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4144,6 +4144,10 @@ func (s *UnrecordedTestSuite) TestFileDownloadFile() {
err = os.Remove(name)
_require.NoError(err)
}(destFileName)
defer func(destFile *os.File) {
err = destFile.Close()
_require.NoError(err)
}(destFile)

cnt, err := fClient.DownloadFile(context.Background(), destFile, &file.DownloadFileOptions{
ChunkSize: 10 * 1024 * 1024,
Expand All @@ -4152,18 +4156,8 @@ func (s *UnrecordedTestSuite) TestFileDownloadFile() {
_require.NoError(err)
_require.Equal(cnt, fileSize)

err = destFile.Close()
_require.NoError(err)

newDestFileHandle, err := os.Open(destFileName)
_require.NoError(err)
defer func(file *os.File) {
err = file.Close()
_require.NoError(err)
}(newDestFileHandle)

hash := md5.New()
_, err = io.Copy(hash, newDestFileHandle)
_, err = io.Copy(hash, destFile)
_require.NoError(err)
downloadedContentMD5 := hash.Sum(nil)

Expand Down Expand Up @@ -4237,18 +4231,8 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFile() {
_require.NoError(err)
_require.Equal(cnt, fileSize)

err = destFile.Close()
tanyasethi-msft marked this conversation as resolved.
Show resolved Hide resolved
_require.NoError(err)

newDestFileHandle, err := os.Open(destFileName)
_require.NoError(err)
defer func(file *os.File) {
err = file.Close()
_require.NoError(err)
}(newDestFileHandle)

destHash := md5.New()
_, err = io.Copy(destHash, newDestFileHandle)
_, err = io.Copy(destHash, destFile)
_require.NoError(err)
downloadedContentMD5 := destHash.Sum(nil)

Expand Down Expand Up @@ -4327,18 +4311,8 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFileWithRange() {
_require.NoError(err)
_require.Equal(cnt, fileSize)

err = destFile.Close()
_require.NoError(err)

newDestFileHandle, err := os.Open(destFileName)
_require.NoError(err)
defer func(file *os.File) {
err = file.Close()
_require.NoError(err)
}(newDestFileHandle)

destHash := md5.New()
_, err = io.Copy(destHash, newDestFileHandle)
_, err = io.Copy(destHash, destFile)
_require.NoError(err)
downloadedContentMD5 := destHash.Sum(nil)

Expand Down Expand Up @@ -4405,6 +4379,10 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFileWithAccessConditions(
err = os.Remove(name)
_require.NoError(err)
}(destFileName)
defer func(destFile *os.File) {
err = destFile.Close()
_require.NoError(err)
}(destFile)

cnt, err := fClient.DownloadFile(context.Background(), destFile, &file.DownloadFileOptions{
ChunkSize: 2 * 1024,
Expand All @@ -4422,18 +4400,8 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFileWithAccessConditions(
_require.NoError(err)
_require.Equal(cnt, fileSize)

err = destFile.Close()
_require.NoError(err)

newDestFileHandle, err := os.Open(destFileName)
_require.NoError(err)
defer func(file *os.File) {
err = file.Close()
_require.NoError(err)
}(newDestFileHandle)

destHash := md5.New()
_, err = io.Copy(destHash, newDestFileHandle)
_, err = io.Copy(destHash, destFile)
_require.NoError(err)
downloadedContentMD5 := destHash.Sum(nil)

Expand Down Expand Up @@ -4502,6 +4470,10 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFileWithCPK() {
err = os.Remove(name)
_require.NoError(err)
}(destFileName)
defer func(destFile *os.File) {
err = destFile.Close()
_require.NoError(err)
}(destFile)

cnt, err := fClient.DownloadFile(context.Background(), destFile, &file.DownloadFileOptions{
ChunkSize: 2 * 1024,
Expand All @@ -4515,18 +4487,8 @@ func (s *RecordedTestSuite) TestFileUploadDownloadSmallFileWithCPK() {
_require.NoError(err)
_require.Equal(cnt, fileSize)

err = destFile.Close()
_require.NoError(err)

newDestFileHandle, err := os.Open(destFileName)
_require.NoError(err)
defer func(file *os.File) {
err = file.Close()
_require.NoError(err)
}(newDestFileHandle)

destHash := md5.New()
_, err = io.Copy(destHash, newDestFileHandle)
_, err = io.Copy(destHash, destFile)
_require.NoError(err)
downloadedContentMD5 := destHash.Sum(nil)

Expand Down
Loading