aboutsummaryrefslogtreecommitdiffstats
path: root/tests/lib/User
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-07-20 23:09:27 +0200
committerLukas Reschke <lukas@statuscode.ch>2016-07-20 23:09:27 +0200
commitc1589f163c44839fba9b2d3dcfb1e45ee7fa47ef (patch)
tree0f460493ed97959e22f9b1713a641c22cf088ba0 /tests/lib/User
parentadf67fac9632788a86d710fc8fbdb76f041b434f (diff)
downloadnextcloud-server-c1589f163c44839fba9b2d3dcfb1e45ee7fa47ef.tar.gz
nextcloud-server-c1589f163c44839fba9b2d3dcfb1e45ee7fa47ef.zip
Mitigate race condition
Diffstat (limited to 'tests/lib/User')
-rw-r--r--tests/lib/User/SessionTest.php21
1 files changed, 18 insertions, 3 deletions
diff --git a/tests/lib/User/SessionTest.php b/tests/lib/User/SessionTest.php
index 33930a50ce5..379c7e39442 100644
--- a/tests/lib/User/SessionTest.php
+++ b/tests/lib/User/SessionTest.php
@@ -371,13 +371,18 @@ class SessionTest extends \Test\TestCase {
->with('token_auth_enforced', false)
->will($this->returnValue(true));
$request
- ->expects($this->once())
+ ->expects($this->exactly(2))
->method('getRemoteAddress')
->willReturn('192.168.0.1');
$this->throttler
->expects($this->once())
->method('sleepDelay')
->with('192.168.0.1');
+ $this->throttler
+ ->expects($this->once())
+ ->method('getDelay')
+ ->with('192.168.0.1')
+ ->willReturn(0);
$userSession->logClientIn('john', 'doe', $request, $this->throttler);
}
@@ -407,13 +412,18 @@ class SessionTest extends \Test\TestCase {
->method('set')
->with('app_password', 'I-AM-AN-APP-PASSWORD');
$request
- ->expects($this->once())
+ ->expects($this->exactly(2))
->method('getRemoteAddress')
->willReturn('192.168.0.1');
$this->throttler
->expects($this->once())
->method('sleepDelay')
->with('192.168.0.1');
+ $this->throttler
+ ->expects($this->once())
+ ->method('getDelay')
+ ->with('192.168.0.1')
+ ->willReturn(0);
$this->assertTrue($userSession->logClientIn('john', 'I-AM-AN-APP-PASSWORD', $request, $this->throttler));
}
@@ -449,13 +459,18 @@ class SessionTest extends \Test\TestCase {
->will($this->returnValue(true));
$request
- ->expects($this->once())
+ ->expects($this->exactly(2))
->method('getRemoteAddress')
->willReturn('192.168.0.1');
$this->throttler
->expects($this->once())
->method('sleepDelay')
->with('192.168.0.1');
+ $this->throttler
+ ->expects($this->once())
+ ->method('getDelay')
+ ->with('192.168.0.1')
+ ->willReturn(0);
$userSession->logClientIn('john', 'doe', $request, $this->throttler);
}