From 081537d0147217d8885f598f94d6099e3d9637d3 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 16 Nov 2021 12:55:00 +1300 Subject: [PATCH] MNT Adjust a couple of unit tests to run from recipe-kitchen-sink --- tests/php/Core/MemoryLimitTest.php | 21 ++++++++++--------- .../Logging/DetailedErrorFormatterTest.php | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/php/Core/MemoryLimitTest.php b/tests/php/Core/MemoryLimitTest.php index 7fda32dee..c63ba1895 100644 --- a/tests/php/Core/MemoryLimitTest.php +++ b/tests/php/Core/MemoryLimitTest.php @@ -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) { diff --git a/tests/php/Logging/DetailedErrorFormatterTest.php b/tests/php/Logging/DetailedErrorFormatterTest.php index 21b34a735..fb36b91d1 100644 --- a/tests/php/Logging/DetailedErrorFormatterTest.php +++ b/tests/php/Logging/DetailedErrorFormatterTest.php @@ -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 ); }