Alexander Nicolaysen Sørnes : test_om_objects: Cleanup properly when testing objectGetEntries
Chris Morgan
cmorgan at winehq.org
Wed Jan 23 13:33:49 CST 2008
Module: appdb
Branch: master
Commit: 55d9f32c0a50aac2aaa63b04e5e50e676ab2fc81
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55d9f32c0a50aac2aaa63b04e5e50e676ab2fc81
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Wed Jan 23 14:28:19 2008 +0100
test_om_objects: Cleanup properly when testing objectGetEntries
---
unit_test/test_om_objects.php | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php
index 26c2081..5531d06 100644
--- a/unit_test/test_om_objects.php
+++ b/unit_test/test_om_objects.php
@@ -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)
More information about the wine-cvs
mailing list