com web/qa: QA REPORT bugfix: \x0d is line separator with user data, so use it for CIQA QA REPORT bugfix in join that hides tests passing with CIQA:
reports/index.php reports/parse_ciqa.php
| From: | Olivier Doucet | Date: | Sun, 08 Apr 2012 15:33:08 +0000 |
| Subject: | com web/qa: QA REPORT bugfix: \x0d is line separator with user data, so use it for CIQA QA REPORT bugfix in join that hides tests passing with CIQA: reports/index.php reports/parse_ciqa.php |
||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66230@lists.php.net to get a copy of this message | ||
Commit: edb4c92deb490c2e21c53e31fd71cd2193745b58
Author: Olivier Doucet <odoucet@php.net> Sun, 8 Apr 2012 17:33:08 +0200
Parents: a211753c356e968477dcbdb16ca52b872d8f1ac0
Branches: master
Link: http://git.php.net/?p=web/qa.git;a=commitdiff;h=edb4c92deb490c2e21c53e31fd71cd2193745b58
Log:
QA REPORT bugfix: \x0d is line separator with user data, so use it for CIQA
QA REPORT bugfix in join that hides tests passing with CIQA
Changed paths:
M reports/index.php
M reports/parse_ciqa.php
Diff:
diff --git a/reports/index.php b/reports/index.php
index 51c1b58..a54f749 100644
--- a/reports/index.php
+++ b/reports/index.php
@@ -64,10 +64,10 @@ if (isset($_GET['version'])) {
}
$query = 'SELECT failed.test_name,COUNT(failed.id) as cpt,COUNT(DISTINCT failed.diff) as
variations,
- datetime(reports.date) as date,success.id as success, f2.id as failedci FROM failed,
reports
+ datetime(reports.date) as date,success.id as success, r2.id as failedci FROM failed,
reports
LEFT JOIN success ON success.test_name=failed.test_name
LEFT JOIN failed f2 ON (f2.test_name=failed.test_name AND f2.output = "")
- JOIN reports r2 ON (f2.id_report = r2.id)
+ LEFT JOIN reports r2 ON (f2.id_report = r2.id AND r2.user_email="ciqa")
WHERE failed.id_report = reports.id
GROUP BY failed.test_name ORDER BY cpt DESC LIMIT ' . $limit;
$q = @$database->query($query);
diff --git a/reports/parse_ciqa.php b/reports/parse_ciqa.php
index 603e682..0abc5b1 100644
--- a/reports/parse_ciqa.php
+++ b/reports/parse_ciqa.php
@@ -180,7 +180,7 @@ foreach ($successfulTests as $version => $successTests) {
// tests
foreach ($failingTests[$version] as $test => $diff) {
- $firstArray['tests'][$test] = array ('output' => '',
'diff' => $diff);
+ $firstArray['tests'][$test] = array ('output' => '',
'diff' => str_replace("\n", "\x0d\n", $diff));
}
$status = insertToDb_phpmaketest($firstArray, $QA_RELEASES);