Correctly close handle of directory when listing certificates

diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index cae9730eb26150285ba259dd4b76e6c2ab074670..a2a4c8b83d2d03acd39068d1985172b080e35436 100644 (file)
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -49,6 +49,7 @@ class CertificateManager implements ICertificateManager {
                                } catch(\Exception $e) {}
                        }
                }
+               closedir($handle);
                return $result;
        }
 

diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index 5baf9e16e81f832ca55065b38275c04d9ee4bbbe..01b3afb03ee806c78e8d22f9fa833a7f406a7732 100644 (file)
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\CertificateManager;
 
-class CertificateManagerTest extends \PHPUnit_Framework_TestCase {
+class CertificateManagerTest extends \Test\TestCase {
 
        /** @var CertificateManager */
        private $certificateManager;
@@ -18,8 +18,8 @@ class CertificateManagerTest extends \PHPUnit_Framework_TestCase {
        private $user;
 
        function setUp() {
-               $this->username = OC_Util::generateRandomBytes(20);
-               OC_User::createUser($this->username, OC_Util::generateRandomBytes(20));
+               $this->username = $this->getUniqueID('', 20);
+               OC_User::createUser($this->username, $this->getUniqueID('', 20));
 
                \OC_Util::tearDownFS();
                \OC_User::setUserId('');