tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-27 15:09:30 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10151 from creative-commoners/pulls/4/tests-from-recipe

Browse Source 
MNT Adjust a couple of unit tests to run from recipe-kitchen-sink
This commit is contained in:
Michal Kleiner 2021-11-16 15:21:46 +13:00 committed by GitHub
commit 96bc5259a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/php/Core/MemoryLimitTest.php
View File

@ -44,28 +44,29 @@ class MemoryLimitTest extends SapphireTest
{
// ini_set('memory_limit', '64M');
// current memory usage in travis is 197M, can't ini_set this down to 64M
// for recipe-kitchen-sink, it's 284M
// Using a higher memory limit instead
ini_set('memory_limit', '230M');
Environment::setMemoryLimitMax('256M');
ini_set('memory_limit', '330M');
Environment::setMemoryLimitMax('512M');
// It can go up
Environment::increaseMemoryLimitTo('240M');
$this->assertEquals('240M', ini_get('memory_limit'));
Environment::increaseMemoryLimitTo('340M');
$this->assertEquals('340M', ini_get('memory_limit'));
// But not down
Environment::increaseMemoryLimitTo('220M');
$this->assertEquals('240M', ini_get('memory_limit'));
Environment::increaseMemoryLimitTo('320M');
$this->assertEquals('340M', ini_get('memory_limit'));
// Test the different kinds of syntaxes
Environment::increaseMemoryLimitTo(1024*1024*250);
$this->assertEquals('250M', ini_get('memory_limit'));
Environment::increaseMemoryLimitTo(1024*1024*350);
$this->assertEquals('350M', ini_get('memory_limit'));
Environment::increaseMemoryLimitTo('109600K');
$this->assertEquals('250M', ini_get('memory_limit'));
$this->assertEquals('350M', ini_get('memory_limit'));
// Attempting to increase past max size only sets to max
Environment::increaseMemoryLimitTo('1G');
$this->assertEquals('256M', ini_get('memory_limit'));
$this->assertEquals('512M', ini_get('memory_limit'));
// No argument means unlimited (but only if originally allowed)
if (is_numeric($this->origMemLimitMax) && $this->origMemLimitMax < 0) {

2
tests/php/Logging/DetailedErrorFormatterTest.php
View File

@ -23,7 +23,7 @@ class DetailedErrorFormatterTest extends SapphireTest
$this->assertStringContainsString("Line 32 in $base/DetailedErrorFormatterTest/ErrorGenerator.php", $output);
$this->assertStringContainsString('* 32: throw new Exception(\'Error\');', $output);
$this->assertStringContainsString(
'SilverStripe\\Logging\\Tests\\DetailedErrorFormatterTest\\ErrorGenerator->mockException(4)',
'SilverStripe\\Logging\\Tests\\DetailedErrorFormatterTest\\ErrorGenerator->mockException',
$output
);
}