mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-52487_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-12-14 09:23:03 +00:00
commit e42b60351e
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
blocks/rss_client/tests/cron_test.php
View File

@ -40,7 +40,7 @@ class block_rss_client_cron_testcase extends advanced_testcase {
* than the current time the attempt is skipped.
*/
public function test_skip() {
global $DB;
global $DB, $CFG;
$this->resetAfterTest();
// Create a RSS feed record with a skip until time set to the future.
$record = (object) array(
@ -57,8 +57,12 @@ class block_rss_client_cron_testcase extends advanced_testcase {
$block = new block_rss_client();
ob_start();
// Silence SimplePie php notices.
@$block->cron();
$errorlevel = error_reporting($CFG->debug & ~E_USER_NOTICE);
$block->cron();
error_reporting($errorlevel);
$cronoutput = ob_get_clean();
$this->assertContains('skipping until ' . userdate($record->skipuntil), $cronoutput);
$this->assertContains('0 feeds refreshed (took ', $cronoutput);
@ -68,7 +72,7 @@ class block_rss_client_cron_testcase extends advanced_testcase {
* Test that when a feed has an error the skip time is increaed correctly.
*/
public function test_error() {
global $DB;
global $DB, $CFG;
$this->resetAfterTest();
$time = time();
// A record that has failed before.
@ -113,8 +117,12 @@ class block_rss_client_cron_testcase extends advanced_testcase {
// Run the cron.
$block = new block_rss_client();
ob_start();
// Silence SimplePie php notices.
@$block->cron();
$errorlevel = error_reporting($CFG->debug & ~E_USER_NOTICE);
$block->cron();
error_reporting($errorlevel);
$cronoutput = ob_get_clean();
$skiptime1 = $record->skiptime * 2;
$message1 = 'http://example.com/rss Error: could not load/find the RSS feed - skipping for ' . $skiptime1 . ' seconds.';

7
lib/tests/rsslib_test.php
View File

@ -99,7 +99,12 @@ EOD;
* Test retrieving a url which doesn't exist.
*/
public function test_failurl() {
$feed = @new moodle_simplepie($this->getExternalTestFileUrl('/rsstest-which-doesnt-exist.xml'), self::TIMEOUT); // We do not want this in php error log.
global $CFG;
// We do not want this in php error log.
$errorlevel = error_reporting($CFG->debug & ~E_USER_NOTICE);
$feed = new moodle_simplepie($this->getExternalTestFileUrl('/rsstest-which-doesnt-exist.xml'), self::TIMEOUT);
error_reporting($errorlevel);
$this->assertNotEmpty($feed->error());
}