summaryrefslogtreecommitdiffstats
path: root/tests/lib/memcache
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-12-02 13:51:36 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-12-03 12:10:55 +0100
commitea4c25609dd23345fa1f639479421ff318e6f6c9 (patch)
tree835bd7798a9b0cd4bb8dc5cf2bd4054775a89a67 /tests/lib/memcache
parente9029f94cb6eb9b37623ea1a2faf8aac11675900 (diff)
downloadnextcloud-server-ea4c25609dd23345fa1f639479421ff318e6f6c9.tar.gz
nextcloud-server-ea4c25609dd23345fa1f639479421ff318e6f6c9.zip
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
Diffstat (limited to 'tests/lib/memcache')
-rw-r--r--tests/lib/memcache/apc.php2
-rw-r--r--tests/lib/memcache/apcu.php2
-rw-r--r--tests/lib/memcache/memcached.php6
-rw-r--r--tests/lib/memcache/xcache.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php
index 550d5068dc1..fdb785b9dc5 100644
--- a/tests/lib/memcache/apc.php
+++ b/tests/lib/memcache/apc.php
@@ -21,6 +21,6 @@ class APC extends Cache {
$this->markTestSkipped('The apc extension is emulated by ACPu.');
return;
}
- $this->instance=new \OC\Memcache\APC(uniqid());
+ $this->instance=new \OC\Memcache\APC($this->getUniqueID());
}
}
diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php
index 1b849e1c54d..afcaa99bfbe 100644
--- a/tests/lib/memcache/apcu.php
+++ b/tests/lib/memcache/apcu.php
@@ -17,6 +17,6 @@ class APCu extends Cache {
$this->markTestSkipped('The APCu extension is not available.');
return;
}
- $this->instance=new \OC\Memcache\APCu(uniqid());
+ $this->instance=new \OC\Memcache\APCu($this->getUniqueID());
}
}
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
index a94b809a7b5..51a78996dd4 100644
--- a/tests/lib/memcache/memcached.php
+++ b/tests/lib/memcache/memcached.php
@@ -16,14 +16,14 @@ class Memcached extends Cache {
if (!\OC\Memcache\Memcached::isAvailable()) {
self::markTestSkipped('The memcached extension is not available.');
}
- $instance = new \OC\Memcache\Memcached(uniqid());
- if ($instance->set(uniqid(), uniqid()) === false) {
+ $instance = new \OC\Memcache\Memcached(self::getUniqueID());
+ if ($instance->set(self::getUniqueID(), self::getUniqueID()) === false) {
self::markTestSkipped('memcached server seems to be down.');
}
}
protected function setUp() {
parent::setUp();
- $this->instance = new \OC\Memcache\Memcached(uniqid());
+ $this->instance = new \OC\Memcache\Memcached($this->getUniqueID());
}
}
diff --git a/tests/lib/memcache/xcache.php b/tests/lib/memcache/xcache.php
index b97d5545c6e..36efe0b220a 100644
--- a/tests/lib/memcache/xcache.php
+++ b/tests/lib/memcache/xcache.php
@@ -17,6 +17,6 @@ class XCache extends Cache {
$this->markTestSkipped('The xcache extension is not available.');
return;
}
- $this->instance = new \OC\Memcache\XCache(uniqid());
+ $this->instance = new \OC\Memcache\XCache($this->getUniqueID());
}
}