commit dcef5348f4457b20bcf29b8754a07160ea572372
author Brett Chabot <brettchabot@android.com> Wed Nov 04 13:23:28 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 04 13:23:28 2009 -0800
tree 5b367b1319312d294915645396b6e82f9cdb1d7f
parent bd38397bc4f754c040d4abf5435c2469c3357924
parent 8742696b0d74f5dc45093d524d12fbb8abb76fa4

am 8742696b: am c20fc77c: Merge change Iefd4a388 into eclair

Merge commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4' into eclair-mr2-plus-aosp

* commit '8742696b0d74f5dc45093d524d12fbb8abb76fa4':
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles

tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java

diff --git a/tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java b/tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java
index fb1b9ad..f2f7743 100755
--- a/tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/AppCacheTest.java
@@ -137,7 +137,8 @@
         verifyTestFiles1(cacheDir, "testtmpdir", 5);
     }
     
-    @LargeTest
+    // TODO: flaky test
+    // @LargeTest
     public void testFreeApplicationCacheSomeFiles() throws Exception {
         StatFs st = new StatFs("/data");
         long blks1 = getFreeStorageBlks(st);