diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /tests/lock/flock_test.php | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'tests/lock/flock_test.php')
| -rw-r--r-- | tests/lock/flock_test.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/lock/flock_test.php b/tests/lock/flock_test.php index 8f0b866ab3..5e5ac5aa78 100644 --- a/tests/lock/flock_test.php +++ b/tests/lock/flock_test.php @@ -13,7 +13,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $lock->release(); @@ -23,7 +23,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $this->assertTrue($lock->owns_lock()); @@ -48,11 +48,11 @@ class phpbb_lock_flock_test extends phpbb_test_case { $path = __DIR__ . '/../tmp/precious'; - $lock1 = new phpbb_lock_flock($path); + $lock1 = new \phpbb\lock\flock($path); $ok = $lock1->acquire(); $this->assertTrue($ok); - $lock2 = new phpbb_lock_flock($path); + $lock2 = new \phpbb\lock\flock($path); $ok = $lock2->acquire(); $this->assertFalse($ok); @@ -78,7 +78,7 @@ class phpbb_lock_flock_test extends phpbb_test_case // wait 0.5 s, acquire the lock, note how long it took sleep(1); - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $start = time(); $ok = $lock->acquire(); $delta = time() - $start; @@ -105,7 +105,7 @@ class phpbb_lock_flock_test extends phpbb_test_case { // child // immediately acquire the lock and sleep for 2 s - $lock = new phpbb_lock_flock($path); + $lock = new \phpbb\lock\flock($path); $ok = $lock->acquire(); $this->assertTrue($ok); $this->assertTrue($lock->owns_lock()); |