holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logged in tests when session ID is not created (CLI)

Browse Source
This commit is contained in:
nathangray 2019-04-12 13:51:15 -06:00
parent bb16d47c7c
commit a0e131d395
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/tests/LoggedInTest.php
View File

@ -203,7 +203,12 @@ abstract class LoggedInTest extends TestCase
{
if (!($sessionid = $GLOBALS['egw']->session->create($GLOBALS['egw_login_data'])))
{
die("Wrong account or password - run tests with 'phpunit -c doc/phpunit.xml' or 'phpunit <test_dir> -c doc/phpunit.xml'\n\n");
if(!($reason = $GLOBALS['egw']->session->reason) && $GLOBALS['egw']->session->account_id)
{
$GLOBALS['egw']->session->sessionid = 'CLI';
return 'CLI';
}
die($reason ? $reason : "Wrong account or password - run tests with 'phpunit -c doc/phpunit.xml' or 'phpunit <test_dir> -c doc/phpunit.xml'\n\n");
}
unset($GLOBALS['egw_login_data']);
return $sessionid;