Improve flakiness logic for print-flaky-tests.

Tools/Scripts/webkitpy/layout_tests/layout_package/bot_test_expectations_unittest.py

 # Copyright (C) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 117 matching lines @@
         self.assertEqual(expectations.unexpected_results_by_path(), expectations_string)
 
     def test_basic(self):
         test_data = {
             'tests': {
                 'foo': {
                     'veryflaky.html': self._results_from_string('FFP'),
                     'maybeflaky.html': self._results_from_string('FP'),
                     'notflakypass.html': self._results_from_string('P'),
                     'notflakyfail.html': self._results_from_string('F'),
+                    # Even if there are no expected results, it's not very flaky if it didn't do mulitple retries.
+                    # This accounts for the latest expectations not necessarily matching the expectations
+                    # at the time of the given run.
+                    'notverflakynoexpected.html': self._results_from_string('FT'),
+                    # If the test is flaky, but marked as such, it shouldn't get printed out.
+                    'notflakyexpected.html': {'results': [[2, 'FFFP']], 'expected': 'PASS FAIL'},
                 }
             }
         }
         self._assert_expectations(test_data, {
             'foo/veryflaky.html': sorted(["TEXT", "PASS"]),
         }, only_ignore_very_flaky=True)
 
         self._assert_expectations(test_data, {
             'foo/veryflaky.html': sorted(["TEXT", "PASS"]),
+            'foo/notverflakynoexpected.html': ['TEXT', 'TIMEOUT'],
             'foo/maybeflaky.html': sorted(["TEXT", "PASS"]),
         }, only_ignore_very_flaky=False)
 
     def test_unexpected_results_no_unexpected(self):
         test_data = {
             'tests': {
                 'foo': {
                     'pass1.html': {'results': [[4, 'P']]},
                     'pass2.html': {'results': [[2, 'Z']], 'expected': 'PASS FAIL'},
                     'fail.html': {'results': [[2, 'P'], [1, 'F']], 'expected': 'PASS FAIL'},
@@ skipping 23 matching lines @@
         self._assert_unexpected_results(test_data, {
             'foo/pass1.html': sorted(["FAIL", "PASS"]),
             'foo/pass2.html': sorted(["IMAGE", "PASS"]),
             'foo/fail.html': sorted(["TEXT", "PASS"]),
             'foo/f_p.html': sorted(["TEXT", "PASS"]),
             'foo/crash.html': sorted(["WONTFIX", "CRASH", "TEXT"]),
             'foo/image.html': sorted(["CRASH", "FAIL", "IMAGE"]),
             'foo/i_f.html': sorted(["PASS", "IMAGE", "TEXT"]),
             'foo/all.html': sorted(["TEXT", "PASS", "IMAGE+TEXT", "TIMEOUT", "CRASH", "IMAGE", "MISSING", "LEAK"]),
         })