Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-03-17 10:23:24 +0400
committermattab <matthieu.aubry@gmail.com>2014-03-17 10:23:24 +0400
commit1e6eede7ca5c49be7bfc2978b11c74e1f284b8d8 (patch)
treefaed3ddb44a6340e1fe165fa51ac413cab3c2373 /tests/PHPUnit
parentb41600e183823abb5072d91836f20674e721abc0 (diff)
Tweaks to see if it helps the last build failure...
Diffstat (limited to 'tests/PHPUnit')
-rw-r--r--tests/PHPUnit/Integration/ArchiveCronTest.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index dcc313d75c..1a835fd6d3 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -69,7 +69,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
// API Call Without segments
$results[] = array('VisitsSummary.get', array('idSite' => 'all',
'date' => '2012-08-09',
- 'periods' => array('day', 'week', 'month', 'year')));
+ 'periods' => array('day', 'month', 'year', 'week')));
return $results;
}
@@ -130,7 +130,7 @@ class Test_Piwik_Integration_ArchiveCronTest extends IntegrationTestCase
// run the command
exec($cmd, $output, $result);
- if ($result !== 0) {
+ if ($result !== 0 || stripos($result, "error")) {
throw new Exception("archive cron failed: " . implode("\n", $output) . "\n\ncommand used: $cmd");
}