The test server build fixes.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2014 01:07:16 +0000 (01:07 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 31 Jan 2014 01:07:16 +0000 (01:07 +0000)
* TestResultServer/model/jsonresults.py:
(JsonResults.merge):
* TestResultServer/static-dashboards/flakiness_dashboard.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163136 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestResultServer/model/jsonresults.py
Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

index 89152ab..46c188a 100644 (file)
@@ -1,5 +1,13 @@
 2014-01-30  Ryosuke Niwa  <rniwa@webkit.org>
 
+        The test server build fixes.
+
+        * TestResultServer/model/jsonresults.py:
+        (JsonResults.merge):
+        * TestResultServer/static-dashboards/flakiness_dashboard.js:
+
+2014-01-30  Ryosuke Niwa  <rniwa@webkit.org>
+
         NRWT shouldn't say "Finished writing JSON files" if it failed to to so
         https://bugs.webkit.org/show_bug.cgi?id=127966
 
index 16316f3..c642351 100755 (executable)
@@ -293,7 +293,7 @@ class JsonResults(object):
             return incremental
 
         if aggregated_json[builder][JSON_RESULTS_BUILD_NUMBERS][0] == incremental_json[builder][JSON_RESULTS_BUILD_NUMBERS][0]:
-            logging.error("Incremental JSON's build number is the latest build number in the aggregated JSON: %d." % aggregated_json[builder][JSON_RESULTS_BUILD_NUMBERS][0])
+            logging.error("Incremental JSON's build number is the latest build number in the aggregated JSON: %s." % aggregated_json[builder][JSON_RESULTS_BUILD_NUMBERS][0])
             return aggregated
 
         logging.info("Merging json results...")
index 4ca7cd2..d17984c 100644 (file)
@@ -43,13 +43,6 @@ var PLATFORMS = {
             'MAC': {
                 expectationsDirectory: 'mac',
                 subPlatforms: {
-                    'LION': {
-                        expectationsDirectory: 'mac-lion',
-                        subPlatforms: {
-                            'WK1': { fallbackPlatforms: ['APPLE_MAC_LION', 'APPLE_MAC'] },
-                            'WK2': { fallbackPlatforms: ['APPLE_MAC_LION', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
-                        }
-                    },
                     'MOUNTAINLION': {
                         subPlatforms: {
                             'WK1': { fallbackPlatforms: ['APPLE_MAC_MOUNTAINLION', 'APPLE_MAC'] },