Also archive diff files in layout-test-results.zip.

scripts/slave/chromium/archive_layout_test_results_unittest.py

Index: scripts/slave/chromium/archive_layout_test_results_unittest.py
diff --git a/scripts/slave/chromium/archive_layout_test_results_unittest.py b/scripts/slave/chromium/archive_layout_test_results_unittest.py
index fb4471bfb66a547bcedaea3074bba5e50aca6028..ba4a757e0e1ea1ff28f7e9a01af3f86af14f99bb 100755
--- a/scripts/slave/chromium/archive_layout_test_results_unittest.py
+++ b/scripts/slave/chromium/archive_layout_test_results_unittest.py
@@ -12,31 +12,43 @@ BASE_DIR = os.path.join(
 sys.path.append(os.path.join(BASE_DIR, 'scripts'))
 sys.path.append(os.path.join(BASE_DIR, 'site_config'))
 
-from slave.chromium import archive_layout_test_results
+from slave.chromium import archive_layout_test_results as archive_module
 
 
 class ArchiveLayoutTestResultsTest(unittest.TestCase):
 
-  def test_IsActualResultFile(self):
-    self.assertTrue(archive_layout_test_results._IsActualResultFile(
-        'foo-crash-log.txt'))
-    self.assertTrue(archive_layout_test_results._IsActualResultFile(
-        'foo-stack.txt'))
-
-    self.assertFalse(archive_layout_test_results._IsActualResultFile(
-        'crash-logging-foo.txt'))
-    self.assertFalse(archive_layout_test_results._IsActualResultFile(
-        'stack-foo.txt'))
-
-    self.assertTrue(archive_layout_test_results._IsActualResultFile(
-        'foo-actual.txt'))
-    self.assertTrue(archive_layout_test_results._IsActualResultFile(
-        'foo-actual.png'))
-
-    self.assertFalse(archive_layout_test_results._IsActualResultFile(
-        'foo-actual.jpg'))
-    self.assertFalse(archive_layout_test_results._IsActualResultFile(
-        'foo-actual.html'))
+  def testIsIncludedInZipArchiveFilesCrashLogs(self):
+    self.assertTrue(archive_module._IsIncludedInZipArchive('foo-crash-log.txt'))
+    self.assertTrue(archive_module._IsIncludedInZipArchive('foo-stack.txt'))
+
+  def testIsIncludedInZipArchiveFilesNonCrashLogFiles(self):
+    self.assertFalse(archive_module._IsIncludedInZipArchive('crashlog-foo.txt'))
+    self.assertFalse(archive_module._IsIncludedInZipArchive('stack-foo.txt'))
+
+  def testIsIncludedInZipArchiveFilesActualFiles(self):
+    self.assertTrue(archive_module._IsIncludedInZipArchive('foo-actual.txt'))
+    self.assertTrue(archive_module._IsIncludedInZipArchive('foo-actual.png'))
+
+  def testIsIncludedInZipArchiveFilesActualFilesWrongExtension(self):
+    self.assertFalse(archive_module._IsIncludedInZipArchive('foo-actual.jpg'))
+    self.assertFalse(archive_module._IsIncludedInZipArchive('foo-actual.html'))
+
+  def testIsIncludedInZipArchiveFilesExpectedFiles(self):
+    self.assertTrue(archive_module._IsIncludedInZipArchive('a-expected.txt'))
+    self.assertTrue(archive_module._IsIncludedInZipArchive('a-expected.html'))
+
+  def testIsIncludedInZipArchiveFilesDiffFiles(self):
+    self.assertTrue(archive_module._IsIncludedInZipArchive('a-diff.png'))
+    self.assertTrue(archive_module._IsIncludedInZipArchive('a-diff.txt'))
+    self.assertTrue(archive_module._IsIncludedInZipArchive('a-wdiff.txt'))
+    self.assertFalse(archive_module._IsIncludedInZipArchive('a-diff.png.foo'))
+
+  def testIsIncludedInZipArchiveFilesOtherNegativeCases(self):
+    self.assertFalse(archive_module._IsIncludedInZipArchive('results.html'))
+    self.assertFalse(archive_module._IsIncludedInZipArchive('my-test.html'))
+
+  def testIsIncludedInZipArchiveFilesJson(self):
+    self.assertTrue(archive_module._IsIncludedInZipArchive('results.json'))
 
 
 if __name__ == '__main__':