New flakiness dashboard should support showing the failing tests per builder

[WebKit-https.git] / Websites / test-results / api / results.php

diff --git a/Websites/test-results/api/results.php b/Websites/test-results/api/results.php
index 0dd6a27ac0bfbc6e8273f9e9c163c55dc664d046..1883ea0f1aeb0761c95a34f5473e4d5fa759d68e 100644 (file)
--- a/Websites/test-results/api/results.php
+++ b/Websites/test-results/api/results.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('../include/json-shared.php');
+require_once('../include/test-results.php');
 
 $db = connect();
 
@@ -13,36 +14,11 @@ if (!$test)
 $result_rows = $db->query_and_fetch_all(
 'SELECT results.*, builds.*, array_agg((build_revisions.repository, build_revisions.value, build_revisions.time)) AS revisions
     FROM results, builds, build_revisions
-    WHERE build_revisions.build = builds.id AND results.test = $1 AND results.build = builds.id
+    WHERE build_revisions.build = builds.id AND results.build = builds.id AND results.test = $1
     GROUP BY results.id, builds.id', array($test['id']));
 if (!$result_rows)
     exit_with_error('ResultsNotFound');
 
-date_default_timezone_set('UTC');
-function parse_revisions_array($postgres_array) {
-    // e.g. {"(WebKit,131456,\"2012-10-16 14:53:00\")","(Safari,162004,)"}
-    $outer_array = json_decode('[' . trim($postgres_array, '{}') . ']');
-    $revisions = array();
-    foreach ($outer_array as $item) {
-        $name_and_revision = explode(',', trim($item, '()'));
-        $time = strtotime(trim($name_and_revision[2], '"')) * 1000;
-        $revisions[trim($name_and_revision[0], '"')] = array(trim($name_and_revision[1], '"'), $time);
-    }
-    return $revisions;
-}
-
-$builders = array();
-foreach ($result_rows as $result) {
-    array_push(array_ensure_item_has_array($builders, $result['builder']),
-        array('buildTime' => strtotime($result['start_time']) * 1000,
-        'revisions' => parse_revisions_array($result['revisions']),
-        'builder' => $result['builder'],
-        'slave' => $result['slave'],
-        'buildNumber' => $result['number'],
-        'actual' => $result['actual'],
-        'expected' => $result['expected']));
-}
-
-exit_with_success(array('builders' => $builders));
+exit_with_success(format_result_rows($result_rows));
 
 ?>