commit af99dba399669193422177f88748d35275a37305
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 18 16:29:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 18 16:29:36 2017 +0000
tree 9dc884ed3c5aed0000d1d5735d08d13a61ec28fa
parent 01d748c2905e9514c943fbcd6999e2dd6f202fd2
parent 8e8a4bd7173e8b69067d5bfc7b1d267ecdda36b5

Merge "Make AlmostFullTest no longer overfill the disk." into nougat-mr1-cts-dev

tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java

diff --git a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
index 11b150e..0fbc872 100644
--- a/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
+++ b/tests/filesystem/src/android/filesystem/cts/AlmostFullTest.java
@@ -63,7 +63,9 @@
                 Log.i(TAG, "free disk " + freeDisk + " too small, needs " + FREE_SPACE_FINAL);
                 return;
             }
-            final long MAX_FILE_SIZE_TO_FILL = 1024L * 1024L * 1024L;
+            // Ensure MAX_SIZE_TO_FILL is an integral multiple of FileUtil.BUFFER_SIZE to avoid
+            // rounding errors caused by FileUtil.createNewFilledFile. See b/63535343.
+            final long MAX_FILE_SIZE_TO_FILL = FileUtil.BUFFER_SIZE * 100L;
             long filled = 0;
             while (filled < diskToFill) {
                 long toFill = diskToFill - filled;