@@ -733,7 +733,7 @@ class FileAPITest extends APISpec {
733733 def " Set HTTP headers headers" () {
734734 setup :
735735 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
736- fc. flush(data. defaultDataSize)
736+ fc. flush(data. defaultDataSize, true )
737737 def putHeaders = new PathHttpHeaders ()
738738 .setCacheControl(cacheControl)
739739 .setContentDisposition(contentDisposition)
@@ -918,7 +918,7 @@ class FileAPITest extends APISpec {
918918 def " Read all null" () {
919919 setup :
920920 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
921- fc. flush(data. defaultDataSize)
921+ fc. flush(data. defaultDataSize, true )
922922
923923 when :
924924 def stream = new ByteArrayOutputStream ()
@@ -985,7 +985,7 @@ class FileAPITest extends APISpec {
985985 def fileClient = getFileClient(environment. dataLakeAccount. credential, fc. getPathUrl(), new MockRetryRangeResponsePolicy (" bytes=2-6" ))
986986
987987 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
988- fc. flush(data. defaultDataSize)
988+ fc. flush(data. defaultDataSize, true )
989989
990990 when :
991991 def range = new FileRange (2 , 5L )
@@ -1004,7 +1004,7 @@ class FileAPITest extends APISpec {
10041004 def " Read min" () {
10051005 setup :
10061006 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1007- fc. flush(data. defaultDataSize)
1007+ fc. flush(data. defaultDataSize, true )
10081008
10091009 when :
10101010 def outStream = new ByteArrayOutputStream ()
@@ -1020,7 +1020,7 @@ class FileAPITest extends APISpec {
10201020 setup :
10211021 def range = (count == null ) ? new FileRange (offset) : new FileRange (offset, count)
10221022 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1023- fc. flush(data. defaultDataSize)
1023+ fc. flush(data. defaultDataSize, true )
10241024
10251025
10261026 when :
@@ -1095,7 +1095,7 @@ class FileAPITest extends APISpec {
10951095 def " Read md5" () {
10961096 setup :
10971097 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1098- fc. flush(data. defaultDataSize)
1098+ fc. flush(data. defaultDataSize, true )
10991099
11001100 when :
11011101 def response = fc. readWithResponse(new ByteArrayOutputStream (), new FileRange (0 , 3 ), null , null , true , null , null )
@@ -1108,7 +1108,7 @@ class FileAPITest extends APISpec {
11081108 def " Read retry default" () {
11091109 setup :
11101110 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1111- fc. flush(data. defaultDataSize)
1111+ fc. flush(data. defaultDataSize, true )
11121112 def failureFileClient = getFileClient(environment. dataLakeAccount. credential, fc. getFileUrl(), new MockFailureResponsePolicy (5 ))
11131113
11141114 when :
@@ -1138,7 +1138,7 @@ class FileAPITest extends APISpec {
11381138 assert testFile. createNewFile()
11391139 }
11401140 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1141- fc. flush(data. defaultDataSize)
1141+ fc. flush(data. defaultDataSize, true )
11421142
11431143 when :
11441144 // Default overwrite is false so this should fail
@@ -1159,7 +1159,7 @@ class FileAPITest extends APISpec {
11591159 assert testFile. createNewFile()
11601160 }
11611161 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1162- fc. flush(data. defaultDataSize)
1162+ fc. flush(data. defaultDataSize, true )
11631163
11641164 when :
11651165 fc. readToFile(testFile. getPath(), true )
@@ -1178,7 +1178,7 @@ class FileAPITest extends APISpec {
11781178 assert testFile. delete()
11791179 }
11801180 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1181- fc. flush(data. defaultDataSize)
1181+ fc. flush(data. defaultDataSize, true )
11821182
11831183 when :
11841184 fc. readToFile(testFile. getPath())
@@ -1197,7 +1197,7 @@ class FileAPITest extends APISpec {
11971197 assert testFile. delete()
11981198 }
11991199 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1200- fc. flush(data. defaultDataSize)
1200+ fc. flush(data. defaultDataSize, true )
12011201
12021202 when :
12031203 Set<OpenOption > openOptions = new HashSet<> ()
@@ -1220,7 +1220,7 @@ class FileAPITest extends APISpec {
12201220 assert testFile. createNewFile()
12211221 }
12221222 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1223- fc. flush(data. defaultDataSize)
1223+ fc. flush(data. defaultDataSize, true )
12241224
12251225 when :
12261226 Set<OpenOption > openOptions = new HashSet<> ()
@@ -1947,7 +1947,7 @@ class FileAPITest extends APISpec {
19471947
19481948 when :
19491949 clientWithFailure. append(data. defaultInputStream, 0 , data. defaultDataSize)
1950- fc. flush(data. defaultDataSize)
1950+ fc. flush(data. defaultDataSize, true )
19511951
19521952 then :
19531953 def os = new ByteArrayOutputStream ()
@@ -1958,7 +1958,7 @@ class FileAPITest extends APISpec {
19581958 def " Flush data min" () {
19591959 when :
19601960 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
1961- fc. flush(data. defaultDataSize)
1961+ fc. flush(data. defaultDataSize, true )
19621962
19631963 then :
19641964 notThrown(DataLakeStorageException )
@@ -2090,7 +2090,7 @@ class FileAPITest extends APISpec {
20902090 fc = fsc. getFileClient(generatePathName())
20912091
20922092 when :
2093- fc. flush(1 )
2093+ fc. flush(1 , true )
20942094
20952095 then :
20962096 thrown(DataLakeStorageException )
@@ -2099,7 +2099,12 @@ class FileAPITest extends APISpec {
20992099 def " Flush data overwrite" () {
21002100 when :
21012101 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
2102- fc. flush(data. defaultDataSize)
2102+ fc. flush(data. defaultDataSize, true )
2103+
2104+ then :
2105+ notThrown(DataLakeStorageException )
2106+
2107+ when :
21032108 fc. append(new ByteArrayInputStream (data. defaultBytes), 0 , data. defaultDataSize)
21042109 // Attempt to write data without overwrite enabled
21052110 fc. flush(data. defaultDataSize, false )
@@ -3004,7 +3009,7 @@ class FileAPITest extends APISpec {
30043009
30053010 fc. create(true )
30063011 fc. append(inputStream, 0 , data. length)
3007- fc. flush(data. length)
3012+ fc. flush(data. length, true )
30083013 }
30093014
30103015 def uploadSmallJson(int numCopies) {
@@ -3019,7 +3024,7 @@ class FileAPITest extends APISpec {
30193024
30203025 fc. create(true )
30213026 fc. append(inputStream, 0 , b. length())
3022- fc. flush(b. length())
3027+ fc. flush(b. length(), true )
30233028 }
30243029
30253030 byte [] readFromInputStream(InputStream stream, int numBytesToRead) {
0 commit comments