diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-15 16:01:54 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-09-29 11:44:04 +0200 |
commit | c9622ccb62652b71fc12f000813d94f62f7ac327 (patch) | |
tree | 3fa46984183dafb4179fb941319d782a10542bb0 /apps/user_ldap/tests/Integration/AbstractIntegrationTest.php | |
parent | 95ec247d102f968322457e49ba16e13a2ec1bddd (diff) | |
download | nextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.tar.gz nextcloud-server-c9622ccb62652b71fc12f000813d94f62f7ac327.zip |
fix LDAP User deletion (cleanup)
discovered a bug in the integration test which lead to following a
different code path and giving a false-positive success feedback.
Also listens now to the evendispatcher instead of old hook system
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/tests/Integration/AbstractIntegrationTest.php')
-rw-r--r-- | apps/user_ldap/tests/Integration/AbstractIntegrationTest.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php index 9891a4f719d..84e1e6b458a 100644 --- a/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php +++ b/apps/user_ldap/tests/Integration/AbstractIntegrationTest.php @@ -144,11 +144,17 @@ abstract class AbstractIntegrationTest { foreach($methods as $method) { if(strpos($method, 'case') === 0) { print("running $method " . PHP_EOL); - if(!$this->$method()) { - print(PHP_EOL . '>>> !!! Test ' . $method . ' FAILED !!! <<<' . PHP_EOL . PHP_EOL); + try { + if(!$this->$method()) { + print(PHP_EOL . '>>> !!! Test ' . $method . ' FAILED !!! <<<' . PHP_EOL . PHP_EOL); + exit(1); + } + $atLeastOneCaseRan = true; + } catch(\Exception $e) { + print(PHP_EOL . '>>> !!! Test ' . $method . ' RAISED AN EXCEPTION !!! <<<' . PHP_EOL); + print($e->getMessage() . PHP_EOL . PHP_EOL); exit(1); } - $atLeastOneCaseRan = true; } } if($atLeastOneCaseRan) { |