test_om_objects: Cleanup properly when testing objectGetEntries
This commit is contained in:
committed by
Chris Morgan
parent
1f081f4be1
commit
55d9f32c0a
@@ -111,13 +111,12 @@ function test_class($sClassName, $aTestMethods)
|
||||
{
|
||||
error("Got $iReceived instead of >= $iExpected");
|
||||
error("FAILED\t\t$sClassName::$sMethod");
|
||||
$oTestObject->purge();
|
||||
cleanup_and_purge($oTestObject, $oUser);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/* Class specific clean-up */
|
||||
cleanup($oTestObject);
|
||||
$oTestObject->purge();
|
||||
cleanup_and_purge($oTestObject, $oUser);
|
||||
|
||||
echo "PASSED\t\t$sClassName::$sMethod\n";
|
||||
break;
|
||||
@@ -183,6 +182,18 @@ function cleanup($oObject)
|
||||
}
|
||||
}
|
||||
|
||||
function cleanup_and_purge($oObject, $oUser)
|
||||
{
|
||||
$bWasAdmin = $oUser->hasPriv('admin');
|
||||
|
||||
$oUser->addPriv('admin');
|
||||
cleanup($oObject);
|
||||
$oObject->purge();
|
||||
|
||||
if(!$bWasAdmin)
|
||||
$oUser->delPriv('admin');
|
||||
}
|
||||
|
||||
function create_object($sClassName, $oUser, $bAsAdmin = true)
|
||||
{
|
||||
if($bAsAdmin)
|
||||
|
||||
Reference in New Issue
Block a user