Merge pull request #10666 from tobiasd/20210905-credits

[friendica.git] / tests / src / Core / Lock / MemcacheCacheLockTest.php

diff --git a/tests/src/Core/Lock/MemcacheCacheLockTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php
index f4aab0602cd943cc6cd3c5c2be0cdf96277c083f..98266852f9b808a3e5fd4b258adb69f5120a0403 100644 (file)
--- a/tests/src/Core/Lock/MemcacheCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,9 +21,11 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
+use Exception;
 use Friendica\Core\Cache\MemcacheCache;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\Lock\CacheLock;
+use Mockery;
 
 /**
  * @requires extension Memcache
@@ -33,7 +35,7 @@ class MemcacheCacheLockTest extends LockTest
 {
        protected function getInstance()
        {
-               $configMock = \Mockery::mock(IConfig::class);
+               $configMock = Mockery::mock(IConfig::class);
 
                $host = $_SERVER['MEMCACHE_HOST'] ?? 'localhost';
                $port = $_SERVER['MEMCACHE_PORT'] ?? '11211';
@@ -52,8 +54,8 @@ class MemcacheCacheLockTest extends LockTest
                try {
                        $cache = new MemcacheCache($host, $configMock);
                        $lock = new CacheLock($cache);
-               } catch (\Exception $e) {
-                       $this->markTestSkipped('Memcache is not available');
+               } catch (Exception $e) {
+                       static::markTestSkipped('Memcache is not available');
                }
 
                return $lock;
@@ -61,17 +63,19 @@ class MemcacheCacheLockTest extends LockTest
 
        /**
         * @small
+        * @doesNotPerformAssertions
         */
        public function testGetLocks()
        {
-               $this->markTestIncomplete('Race condition because of too fast getAllKeys() which uses a workaround');
+               static::markTestIncomplete('Race condition because of too fast getAllKeys() which uses a workaround');
        }
 
        /**
         * @small
+        * @doesNotPerformAssertions
         */
        public function testGetLocksWithPrefix()
        {
-               $this->markTestIncomplete('Race condition because of too fast getAllKeys() which uses a workaround');
+               static::markTestIncomplete('Race condition because of too fast getAllKeys() which uses a workaround');
        }
 }