tonyair/silverstripe-testsession
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-testsession synced 2024-10-22 14:06:00 +02:00
Code Issues Projects Releases Wiki Activity

Make 'database' state optional

Browse Source
This commit is contained in:
Ingo Schommer 2014-02-27 14:46:23 +13:00
parent add47cb625
commit 2c12cde90a
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/TestSessionEnvironment.php
View File

@ -128,6 +128,7 @@ class TestSessionEnvironment extends Object {
} }
} }
if(isset($state->database) && $state->database) {
if(!DB::getConn()) { if(!DB::getConn()) {
// No connection, so try and connect to tmpdb if it exists // No connection, so try and connect to tmpdb if it exists
if(isset($state->database)) { if(isset($state->database)) {
@ -146,6 +147,7 @@ class TestSessionEnvironment extends Object {
DB::connect($databaseConfig); DB::connect($databaseConfig);
} }
} }
}
// Database // Database
if(!$this->isRunningTests() && (@$state->createDatabase || @$state->database)) { if(!$this->isRunningTests() && (@$state->createDatabase || @$state->database)) {
@ -246,11 +248,6 @@ class TestSessionEnvironment extends Object {
$contents = file_get_contents(Director::getAbsFile($this->config()->test_state_file)); $contents = file_get_contents(Director::getAbsFile($this->config()->test_state_file));
$json = json_decode($contents); $json = json_decode($contents);
if(!isset($json->database)) {
throw new \LogicException('The test session file ('
. Director::getAbsFile($this->config()->test_state_file) . ') doesn\'t contain a database name.');
}
$this->applyState($json); $this->applyState($json);
} catch(Exception $e) { } catch(Exception $e) {
throw new \Exception("A test session appears to be in progress, but we can't retrieve the details. " throw new \Exception("A test session appears to be in progress, but we can't retrieve the details. "