diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-29 17:43:31 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-29 17:43:31 +0200 |
| commit | e59ccc5fe929e63c6655c01828e6231643280b29 (patch) | |
| tree | f6a9717221cad44740ef6a455b0b08065b1342af /tests | |
| parent | f79a81258e5a1ecc5563b6d7bcf0a161de7ec44f (diff) | |
| parent | 77cec29b108df7d9c868d60baf74fbe9b64e08f5 (diff) | |
| download | nextcloud-server-e59ccc5fe929e63c6655c01828e6231643280b29.tar.gz nextcloud-server-e59ccc5fe929e63c6655c01828e6231643280b29.zip | |
Merge pull request #24299 from owncloud/availability-avoid-concurrency
Prevent concurrent storage availability checks
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/files/storage/wrapper/availability.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/lib/files/storage/wrapper/availability.php b/tests/lib/files/storage/wrapper/availability.php index 9b394df8ca3..99d6f7dbe5c 100644 --- a/tests/lib/files/storage/wrapper/availability.php +++ b/tests/lib/files/storage/wrapper/availability.php @@ -74,9 +74,12 @@ class Availability extends \Test\TestCase { $storage->expects($this->once()) ->method('test') ->willReturn(true); - $storage->expects($this->once()) + $storage->expects($this->exactly(2)) ->method('setAvailability') - ->with($this->equalTo(true)); + ->withConsecutive( + [$this->equalTo(false)], // prevents concurrent rechecks + [$this->equalTo(true)] // sets correct availability + ); $storage->expects($this->once()) ->method('mkdir'); |