- Some nicer messages when things go wrong

- Reset account backend after test
This commit is contained in:
nathangray 2017-01-11 15:41:53 -07:00
parent 03fb09e199
commit 5e13b8dfda

View File

@ -41,13 +41,29 @@ abstract class AppTest extends TestCase
*/ */
public static function setUpBeforeClass() public static function setUpBeforeClass()
{ {
// These globals pulled from the test config (phpunit.xml) try
static::load_egw($GLOBALS['EGW_USER'],$GLOBALS['EGW_PASSWORD'], $GLOBALS['EGW_DOMAIN']); {
// 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 // Re-init config, since it doesn't get handled by loading Egw
Api\Config::init_static(); 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 $GLOBALS['egw']->session->kp3
); );
} }
if($GLOBALS['egw']->accounts)
{
$GLOBALS['egw']->accounts->backend = null;
}
unset($GLOBALS['egw']); unset($GLOBALS['egw']);
} }
unset($GLOBALS['egw_info']); unset($GLOBALS['egw_info']);