2 files changed, 16 insertions, 2 deletions
diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
index 5283d425..d2ecf3e6 100644
--- a/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/AbstractDownloadManagerFunctionalTest.java
@@ -155,13 +155,12 @@ public abstract class AbstractDownloadManagerFunctionalTest extends
         Context realContext = getContext();
         mTestContext = new TestContext(realContext);
         setupProviderAndResolver();
-        assert isDatabaseEmpty(); // ensure we're not messing with real data
 
         mTestContext.setResolver(mResolver);
         setContext(mTestContext);
         setupService();
         getService().mSystemFacade = mSystemFacade;
-
+        assertTrue(isDatabaseEmpty()); // ensure we're not messing with real data
         mServer = new MockWebServer();
         mServer.play();
     }
diff --git a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
index c3ac8904..e01b617f 100644
--- a/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
+++ b/tests/src/com/android/providers/downloads/DownloadManagerFunctionalTest.java
@@ -23,6 +23,8 @@ import android.net.Uri;
 import android.os.Environment;
 import android.provider.Downloads;
 import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+
 import tests.http.MockWebServer;
 import tests.http.RecordedRequest;
 
@@ -37,6 +39,8 @@ import java.net.MalformedURLException;
  */
 @LargeTest
 public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFunctionalTest {
+    private static final String TAG = "DownloadManagerFunctionalTest";
+
     public DownloadManagerFunctionalTest() {
         super(new FakeSystemFacade());
     }
@@ -104,6 +108,17 @@ public class DownloadManagerFunctionalTest extends AbstractDownloadManagerFuncti
 
     private void runUntilStatus(Uri downloadUri, int status) throws Exception {
         runService();
+        boolean done = false;
+        while (!done) {
+            int rslt = getDownloadStatus(downloadUri);
+            if (rslt == Downloads.Impl.STATUS_RUNNING || rslt == Downloads.Impl.STATUS_PENDING) {
+                Log.i(TAG, "status is: " + rslt + ", for: " + downloadUri);
+                DownloadHandler.getInstance().WaitUntilDownloadsTerminate();
+                Thread.sleep(100);
+            } else {
+                done = true;
+            }
+        }
         assertEquals(status, getDownloadStatus(downloadUri));
     }