From a85832b4772626852142b60c4806ff5384a76478 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 17 Dec 2012 17:05:03 -0800 Subject: Always append to files, handle end of stream. Fix bug where resumed downloads wouldn't open in append mode. Handle end of stream exceptions from URLConnection as special-case for now to keep tests passing. Move stream creation outside of DrmOutputStream, and always fsync() before closing files. Treat HTTP header errors as retryable. Add explicit state checks to redirection tests. Change-Id: I19d007284f6bfbffaac93859fe47cd98b79a59c4 --- .../com/android/providers/downloads/PublicApiFunctionalTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/src/com/android/providers/downloads') diff --git a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java index 2661a1f2..1e6b7053 100644 --- a/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/PublicApiFunctionalTest.java @@ -649,13 +649,14 @@ public class PublicApiFunctionalTest extends AbstractPublicApiTest { .setHeader("Location", mServer.getUrl(REDIRECTED_PATH).toString())); enqueueInterruptedDownloadResponses(5); - Download download = enqueueRequest(getRequest()); - runService(); + final Download download = enqueueRequest(getRequest()); + download.runUntilStatus(DownloadManager.STATUS_PAUSED); + mSystemFacade.incrementTimeMillis(RETRY_DELAY_MILLIS); + download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); + assertEquals(REQUEST_PATH, takeRequest().getPath()); assertEquals(REDIRECTED_PATH, takeRequest().getPath()); - mSystemFacade.incrementTimeMillis(RETRY_DELAY_MILLIS); - download.runUntilStatus(DownloadManager.STATUS_SUCCESSFUL); return takeRequest(); } } -- cgit v1.2.3