[Android Crash Reporting] Correct the regex for uploaded minidump filenames.

components/minidump_uploader/android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.components.minidump_uploader;
 
 import static org.junit.Assert.assertArrayEquals;
 
 import android.os.ParcelFileDescriptor;
 import android.support.test.filters.MediumTest;
@@ skipping 63 matching lines @@
         mTmpFile3 = new File(mCrashDir, "abcdefghi" + CrashFileManager.TMP_SUFFIX);
         mTmpFile3.createNewFile();
         mTmpFile3.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
         mDmpFile1 = new File(mCrashDir, "123_abc.dmp0");
         mDmpFile1.createNewFile();
         mDmpFile1.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
-        mDmpFile2 = new File(mCrashDir, "chromium-renderer_abc.dmp" + TEST_PID);
+        mDmpFile2 = new File(mCrashDir, "chromium-renderer_abc.dmp" + TEST_PID + ".try1");
         mDmpFile2.createNewFile();
         mDmpFile2.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
         mOneBelowMaxTriesFile = new File(mCrashDir,
                 "chromium-renderer_abc.dmp" + TEST_PID + ".try" + (MAX_TRIES_ALLOWED - 1));
         mOneBelowMaxTriesFile.createNewFile();
         mOneBelowMaxTriesFile.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
@@ skipping 13 matching lines @@
                 "chromium-renderer_abc.dmp" + TEST_PID + ".try" + MULTI_DIGIT_MAX_TRIES_ALLOWED);
         mMultiDigitMaxTriesFile.createNewFile();
         mMultiDigitMaxTriesFile.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
         mUpFile1 = new File(mCrashDir, "123_abcd.up0");
         mUpFile1.createNewFile();
         mUpFile1.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
-        mUpFile2 = new File(mCrashDir, "chromium-renderer_abcd.up" + TEST_PID);
+        mUpFile2 = new File(mCrashDir, "chromium-renderer_abcd.up" + TEST_PID + ".try0");
         mUpFile2.createNewFile();
         mUpFile2.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
         mLogfile = new File(mCrashDir, CrashFileManager.CRASH_DUMP_LOGFILE);
         mLogfile.createNewFile();
         mLogfile.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
     }
 
@@ skipping 186 matching lines @@
         assertEquals("file.forced0.try0",
                 CrashFileManager.filenameWithForcedUploadState("file.forced0.try3"));
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testMarkUploadSuccess() {
         CrashFileManager.markUploadSuccess(mDmpFile1);
         assertFalse(mDmpFile1.exists());
         assertTrue(new File(mCrashDir, "123_abc.up0").exists());
+
+        CrashFileManager.markUploadSuccess(mDmpFile2);
+        assertFalse(mDmpFile2.exists());
+        assertTrue(new File(mCrashDir, "chromium-renderer_abc.up" + TEST_PID + ".try1").exists());
     }
 
     @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testMarkUploadSuccess_ForcedUpload() throws IOException {
-        File forced = new File(mCrashDir, "123_abc.forced0");
+        File forced = new File(mCrashDir, "123_abc.forced" + TEST_PID + ".try0");
         forced.createNewFile();
         CrashFileManager.markUploadSuccess(forced);
         assertFalse(forced.exists());
-        assertTrue(new File(mCrashDir, "123_abc.up0").exists());
+        assertTrue(new File(mCrashDir, "123_abc.up" + TEST_PID + ".try0").exists());
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testMarkUploadSkipped() {
         CrashFileManager.markUploadSkipped(mDmpFile1);
         assertFalse(mDmpFile1.exists());
         assertTrue(new File(mCrashDir, "123_abc.skipped0").exists());
+
+        CrashFileManager.markUploadSkipped(mDmpFile2);
+        assertFalse(mDmpFile2.exists());
+        assertTrue(
+                new File(mCrashDir, "chromium-renderer_abc.skipped" + TEST_PID + ".try1").exists());
     }
 
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testFilterMinidumpFilesOnUid() {
         assertArrayEquals(new File[] {new File("1_md.dmp")},
                 CrashFileManager.filterMinidumpFilesOnUid(
                         new File[] {new File("1_md.dmp")}, 1).toArray());
         assertArrayEquals(new File[0],
                 CrashFileManager.filterMinidumpFilesOnUid(
@@ skipping 200 matching lines @@
         File old3 = new File(mCrashDir, "chromium-renderer-minidump-cooo10ff.logcat");
         old1.setLastModified(oldTimestamp);
         old2.setLastModified(oldTimestamp - 1);
         old3.setLastModified(oldTimestamp - 2);
 
         // These will be the most recent files in the directory, after all successfully uploaded
         // files and all temp files are removed.
         File[] recentFiles = new File[3 * CrashFileManager.MAX_CRASH_REPORTS_TO_KEEP];
         for (int i = 0; i < CrashFileManager.MAX_CRASH_REPORTS_TO_KEEP; ++i) {
             String prefix = "chromium-renderer-minidump-deadbeef" + i;
-            // There is no reason why both a minidump and failed upload should exist at the same
-            // time, but the cleanup code should be robust to it anyway.
+            // There is no reason why both a minidump-sans-logcat and failed upload should exist at
+            // the same time, but the cleanup code should be robust to it anyway.
             File recentMinidump = new File(mCrashDir, prefix + ".dmp");
-            File recentFailedUpload = new File(mCrashDir, prefix + ".up0.try0");

[gsennton, 2017/03/15 10:18:49]

It's slightly amusing that we had a test case ensuring that this was Not working
correctly ;)

[Ilya Sherman, 2017/03/15 16:32:56]

... yeah, I was clearly pretty confused by the intended state machine when I
first started working on this code =P

+            File recentFailedUpload = new File(mCrashDir, prefix + ".dmp0.try1");
             File recentLogcatFile = new File(mCrashDir, prefix + ".logcat");
             recentMinidump.createNewFile();
             recentFailedUpload.createNewFile();
             recentLogcatFile.createNewFile();
             recentMinidump.setLastModified(mModificationTimestamp);
             mModificationTimestamp += 1000;
             recentFailedUpload.setLastModified(mModificationTimestamp);
             mModificationTimestamp += 1000;
             recentLogcatFile.setLastModified(mModificationTimestamp);
             mModificationTimestamp += 1000;
             recentFiles[3 * i + 0] = recentMinidump;
             recentFiles[3 * i + 1] = recentFailedUpload;
             recentFiles[3 * i + 2] = recentLogcatFile;
         }
 
         // Create some additional successful uploads.
         File success1 = new File(mCrashDir, "chromium-renderer-minidump-cafebebe1.up0");
-        File success2 = new File(mCrashDir, "chromium-renderer-minidump-cafebebe2.up1");
-        File success3 = new File(mCrashDir, "chromium-renderer-minidump-cafebebe3.up2");
+        File success2 =
+                new File(mCrashDir, "chromium-renderer-minidump-cafebebe2.up" + TEST_PID + ".try1");
+        File success3 =
+                new File(mCrashDir, "chromium-renderer-minidump-cafebebe3.up" + TEST_PID + ".try2");
         success1.createNewFile();
         success2.createNewFile();
         success3.createNewFile();
         success1.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
         success2.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
         success3.setLastModified(mModificationTimestamp);
         mModificationTimestamp += 1000;
 
@@ skipping 28 matching lines @@
         assertFalse(mMultiDigitMaxTriesFile.exists());
         assertFalse(mUpFile1.exists());
         assertFalse(mUpFile2.exists());
         assertFalse(temp1.exists());
         assertFalse(temp2.exists());
         assertFalse(success1.exists());
         assertFalse(success2.exists());
         assertFalse(success3.exists());
     }
 }