Bug 999071 - Wait a bit longer for a complete ping file; r=blassey

mobile/android/base/tests/testANRReporter.java

@@ -75,6 +75,24 @@ public class testANRReporter extends BaseTest {
 
     private boolean mDone;
 
+    private JSONObject readPingFile(final File pingFile) throws Exception {
+        final long fileSize = pingFile.length();
+        if (fileSize == 0 || fileSize > Integer.MAX_VALUE) {
+            throw new Exception("Invalid ping file size");
+        }
+        final char[] buffer = new char[(int) fileSize];
+        final FileReader reader = new FileReader(pingFile);
+        try {
+            final int readSize = reader.read(buffer);
+            if (readSize == 0 || readSize > buffer.length) {
+                throw new Exception("Invalid number of bytes read");
+            }
+        } finally {
+            reader.close();
+        }
+        return new JSONObject(new String(buffer));
+    }
+
     public void testANRReporter() throws Exception {
         blockForGeckoReady();
 
@@ -145,8 +163,20 @@ public class testANRReporter extends BaseTest {
         waitForCondition(new Condition() {
             @Override
             public boolean isSatisfied() {
-                final String[] newFiles = pingDir.list();
-                return newFiles != null && newFiles.length > 0;
+                final File[] newFiles = pingDir.listFiles();
+                if (newFiles == null || newFiles.length == 0) {
+                    // Keep waiting.
+                    return false;
+                }
+                // Make sure we have a complete file. We skip assertions and catch all
+                // exceptions here because the condition may not be satisfied now but may
+                // be satisfied later. After the wait is over, we will repeat the same
+                // steps with assertions and exceptions.
+                try {
+                    return readPingFile(newFiles[0]).has("slug");
+                } catch (final Exception e) {
+                    return false;
+                }
             }
         }, WAIT_FOR_PING_TIMEOUT);
 
@@ -161,16 +191,8 @@ public class testANRReporter extends BaseTest {
         mAsserter.ok(newFiles[0].canRead(), "Ping is readable", null);
         mAsserter.info("Found ping file", newFiles[0].getPath());
 
-        final char[] buffer = new char[(int) newFiles[0].length()];
-        final FileReader reader = new FileReader(newFiles[0]);
-        try {
-            mAsserter.ok(reader.read(buffer) > 0, "Read from ping file", null);
-        } finally {
-            reader.close();
-        }
-
         // Check standard properties required by Telemetry server.
-        final JSONObject pingObject = new JSONObject(new String(buffer));
+        final JSONObject pingObject = readPingFile(newFiles[0]);
         mAsserter.ok(pingObject.has("slug"), "Ping has slug property", null);
         mAsserter.ok(pingObject.has("reason"), "Ping has reason property", null);
         mAsserter.ok(pingObject.has("payload"), "Ping has payload property", null);