⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 130709 in webkit


Ignore:
Timestamp:
Oct 8, 2012, 6:36:26 PM (14 years ago)
Author:
dpranke@chromium.org
Message:

results.html and garden-o-matic are ignoring IMAGE failures when expected to FAIL
​https://bugs.webkit.org/show_bug.cgi?id=98706

Reviewed by Ojan Vafai.

FAIL is supposed to map onto Failure which is supposed to map
onto the old [ TEXT, IMAGE_PLUS_TEXT, AUDIO ] mapping.
results.html was including IMAGE in this and garden-o-matic was
including CRASH and TIMEOUT as well :(.

Tools:

  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
  • BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:

LayoutTests:

  • fast/harness/resources/results-test.js:
  • fast/harness/results.html:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r130702 r130709  
     12012-10-08  Dirk Pranke  <dpranke@chromium.org>
     2
     3        results.html and garden-o-matic are ignoring IMAGE failures when expected to FAIL
     4        https://bugs.webkit.org/show_bug.cgi?id=98706
     5
     6        Reviewed by Ojan Vafai.
     7
     8        FAIL is supposed to map onto Failure which is supposed to map
     9        onto the old [ TEXT, IMAGE_PLUS_TEXT, AUDIO ] mapping.
     10        results.html was including IMAGE in this and garden-o-matic was
     11        including CRASH and TIMEOUT as well :(.
     12
     13        * fast/harness/resources/results-test.js:
     14        * fast/harness/results.html:
     15
    1162012-10-08  Alpha Lam  <hclam@chromium.org>
    217

  • trunk/LayoutTests/fast/harness/resources/results-test.js

    r129459 r130709  
    265265    runDefaultSingleRowTest('bar-image-plus-text.html', 'TEXT', 'IMAGE+TEXT', 1, false, 'expected actual diff ', 'images diff (1%) ');
    266266
     267    // test the mapping for FAIL onto only ['TEXT', 'IMAGE+TEXT', 'AUDIO']
     268    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE+TEXT', 1, true, 'expected actual diff ', 'images diff (1%) ');
     269    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'AUDIO', 1, true, 'expected audio actual audio ', '');
     270    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'TEXT', 0, true, 'expected actual diff ', '');
     271    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE', 1, false, '', 'images diff (1%) ');
     272
    267273    results = mockResults();
    268274    results.tests['bar-reftest.html'] = mockExpectation('PASS', 'IMAGE', 1);

  • trunk/LayoutTests/fast/harness/results.html

    r129459 r130709  
    480480            if (expectedArray.indexOf(actualValue) == -1 &&
    481481                (expectedArray.indexOf('FAIL') == -1 ||
    482                  (actualValue != 'IMAGE' && actualValue != 'TEXT' && actualValue != 'IMAGE+TEXT')))
     482                 (actualValue != 'TEXT' && actualValue != 'IMAGE+TEXT' && actualValue != 'AUDIO')))
    483483                isExpected = false;
    484484        }

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js

    r120788 r130709  
    4343var MISSING = 'MISSING';
    4444
    45 var kFailingResults = [TIMEOUT, TEXT, CRASH, IMAGE, IMAGE_TEXT, AUDIO];
     45var kFailingResults = [TEXT, IMAGE_TEXT, AUDIO];
    4646
    4747var kExpectedImageSuffix = '-expected.png';

  • trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js

    r120546 r130709  
    8585};
    8686
    87 test("ResultAnalyzer", 35, function() {
     87test("ResultAnalyzer", 55, function() {
    8888    var analyzer;
    8989
    … …  
    131131
    132132    analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'TIMEOUT'});
     133    ok(!analyzer.expectedToSucceed());
     134    ok(analyzer.hasUnexpectedFailures());
     135    deepEqual(analyzer.unexpectedResults(), ['TIMEOUT']);
     136    ok(!analyzer.succeeded());
     137    ok(!analyzer.flaky());
     138
     139    analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'IMAGE'});
     140    ok(!analyzer.expectedToSucceed());
     141    ok(analyzer.hasUnexpectedFailures());
     142    deepEqual(analyzer.unexpectedResults(), ['IMAGE']);
     143    ok(!analyzer.succeeded());
     144    ok(!analyzer.flaky());
     145
     146    analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'AUDIO'});
     147    ok(!analyzer.expectedToSucceed());
     148    ok(!analyzer.hasUnexpectedFailures());
     149    deepEqual(analyzer.unexpectedResults(), []);
     150    ok(!analyzer.succeeded());
     151    ok(!analyzer.flaky());
     152
     153    analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'TEXT'});
     154    ok(!analyzer.expectedToSucceed());
     155    ok(!analyzer.hasUnexpectedFailures());
     156    deepEqual(analyzer.unexpectedResults(), []);
     157    ok(!analyzer.succeeded());
     158    ok(!analyzer.flaky());
     159
     160    analyzer = new results.ResultAnalyzer({expected: 'FAIL', actual: 'IMAGE+TEXT'});
    133161    ok(!analyzer.expectedToSucceed());
    134162    ok(!analyzer.hasUnexpectedFailures());

  • trunk/Tools/ChangeLog

    r130707 r130709  
     12012-10-08  Dirk Pranke  <dpranke@chromium.org>
     2
     3        results.html and garden-o-matic are ignoring IMAGE failures when expected to FAIL
     4        https://bugs.webkit.org/show_bug.cgi?id=98706
     5
     6        Reviewed by Ojan Vafai.
     7
     8        FAIL is supposed to map onto Failure which is supposed to map
     9        onto the old [ TEXT, IMAGE_PLUS_TEXT, AUDIO ] mapping.
     10        results.html was including IMAGE in this and garden-o-matic was
     11        including CRASH and TIMEOUT as well :(.
     12
     13        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js:
     14        * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results_unittests.js:
     15
    1162012-10-08  Ryuan Choi  <ryuan.choi@samsung.com>
    217
Note: See TracChangeset for help on using the changeset viewer.