forked from extern/egroupware
- Some nicer messages when things go wrong
- Reset account backend after test
This commit is contained in:
parent
03fb09e199
commit
5e13b8dfda
@ -41,13 +41,29 @@ abstract class AppTest extends TestCase
|
||||
*/
|
||||
public static function setUpBeforeClass()
|
||||
{
|
||||
// These globals pulled from the test config (phpunit.xml)
|
||||
static::load_egw($GLOBALS['EGW_USER'],$GLOBALS['EGW_PASSWORD'], $GLOBALS['EGW_DOMAIN']);
|
||||
try
|
||||
{
|
||||
// These globals pulled from the test config (phpunit.xml)
|
||||
static::load_egw($GLOBALS['EGW_USER'],$GLOBALS['EGW_PASSWORD'], $GLOBALS['EGW_DOMAIN']);
|
||||
|
||||
// Re-init config, since it doesn't get handled by loading Egw
|
||||
Api\Config::init_static();
|
||||
// Re-init config, since it doesn't get handled by loading Egw
|
||||
Api\Config::init_static();
|
||||
|
||||
$GLOBALS['egw']->db->connect();
|
||||
if($GLOBALS['egw']->db)
|
||||
{
|
||||
$GLOBALS['egw']->db->connect();
|
||||
}
|
||||
else
|
||||
{
|
||||
static::markTestSkipped('No $GLOBALS[egw]->db');
|
||||
die();
|
||||
}
|
||||
}
|
||||
catch(Exception $e)
|
||||
{
|
||||
static::markTestSkipped('Unable to connect to Egroupware');
|
||||
die();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -64,6 +80,10 @@ abstract class AppTest extends TestCase
|
||||
$GLOBALS['egw']->session->kp3
|
||||
);
|
||||
}
|
||||
if($GLOBALS['egw']->accounts)
|
||||
{
|
||||
$GLOBALS['egw']->accounts->backend = null;
|
||||
}
|
||||
unset($GLOBALS['egw']);
|
||||
}
|
||||
unset($GLOBALS['egw_info']);
|
||||
|
Loading…
Reference in New Issue
Block a user