Merge pull request #198 from joeg/dev

Fix testCurrentOperationByteCount test race condition
Azure · Jan 14, 2013 · 5507198 · 5507198
2 parents a8b26d2 + 4e49db0
commit 5507198
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...rc/test/java/com/microsoft/windowsazure/services/blob/client/CloudBlobContainerTests.java b/...rc/test/java/com/microsoft/windowsazure/services/blob/client/CloudBlobContainerTests.java
@@ -748,21 +748,21 @@ public void testCurrentOperationByteCount() throws URISyntaxException, StorageEx
 
         OperationContext operationContext = new OperationContext();
         BlobRequestOptions options = new BlobRequestOptions();
-        options.setTimeoutIntervalInMs(1000);
+        options.setTimeoutIntervalInMs(2000);
         options.setRetryPolicyFactory(new RetryNoRetry());
+        ByteArrayOutputStream downloadedDataStream = new ByteArrayOutputStream();
         try {
-            final ByteArrayOutputStream downloadedDataStream = new ByteArrayOutputStream();
             blobRef.download(downloadedDataStream, null, options, operationContext);
         }
         catch (Exception e) {
-            Assert.assertEquals(0, operationContext.getCurrentOperationByteCount());
+            Assert.assertEquals(downloadedDataStream.size(), operationContext.getCurrentOperationByteCount());
         }
 
         operationContext = new OperationContext();
         options = new BlobRequestOptions();
         options.setTimeoutIntervalInMs(90000);
 
-        final ByteArrayOutputStream downloadedDataStream = new ByteArrayOutputStream();
+        downloadedDataStream = new ByteArrayOutputStream();
         blobRef.download(downloadedDataStream, null, options, operationContext);
 
         Assert.assertEquals(blockLength * numberOfBlocks, operationContext.getCurrentOperationByteCount());