diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-06-26 14:51:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 14:51:00 +0200 |
| commit | db6361ef0314868edc9d58a81c0806c8c758af0a (patch) | |
| tree | a2c168943d0e15a2d28febf82e31e74b15504117 /apps/federatedfilesharing/tests/DiscoveryManagerTest.php | |
| parent | 03449dcb9a56e642ff4eee31145498bbaeb83319 (diff) | |
| parent | 7a9d60d87eb8e4414e5fe05830b088d426ff810d (diff) | |
| download | nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.tar.gz nextcloud-server-db6361ef0314868edc9d58a81c0806c8c758af0a.zip | |
Merge pull request #226 from nextcloud/master-upstream-sync
[Master] upstream sync
Diffstat (limited to 'apps/federatedfilesharing/tests/DiscoveryManagerTest.php')
| -rw-r--r-- | apps/federatedfilesharing/tests/DiscoveryManagerTest.php | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php index 73f79b2c169..a9c324f0244 100644 --- a/apps/federatedfilesharing/tests/DiscoveryManagerTest.php +++ b/apps/federatedfilesharing/tests/DiscoveryManagerTest.php @@ -77,7 +77,10 @@ class DiscoveryManagerTest extends \Test\TestCase { $this->client ->expects($this->once()) ->method('get') - ->with('https://myhost.com/ocs-provider/', []) + ->with('https://myhost.com/ocs-provider/', [ + 'timeout' => 10, + 'connect_timeout' => 10, + ]) ->willReturn($response); $this->cache ->expects($this->at(0)) @@ -111,7 +114,10 @@ class DiscoveryManagerTest extends \Test\TestCase { $this->client ->expects($this->once()) ->method('get') - ->with('https://myhost.com/ocs-provider/', []) + ->with('https://myhost.com/ocs-provider/', [ + 'timeout' => 10, + 'connect_timeout' => 10, + ]) ->willReturn($response); $expectedResult = '/public.php/MyCustomEndpoint/'; @@ -131,7 +137,10 @@ class DiscoveryManagerTest extends \Test\TestCase { $this->client ->expects($this->once()) ->method('get') - ->with('https://myhost.com/ocs-provider/', []) + ->with('https://myhost.com/ocs-provider/', [ + 'timeout' => 10, + 'connect_timeout' => 10, + ]) ->willReturn($response); $expectedResult = '/public.php/webdav'; @@ -151,7 +160,10 @@ class DiscoveryManagerTest extends \Test\TestCase { $this->client ->expects($this->once()) ->method('get') - ->with('https://myhost.com/ocs-provider/', []) + ->with('https://myhost.com/ocs-provider/', [ + 'timeout' => 10, + 'connect_timeout' => 10, + ]) ->willReturn($response); $expectedResult = '/ocs/v2.php/cloud/MyCustomShareEndpoint'; @@ -171,7 +183,10 @@ class DiscoveryManagerTest extends \Test\TestCase { $this->client ->expects($this->once()) ->method('get') - ->with('https://myhost.com/ocs-provider/', []) + ->with('https://myhost.com/ocs-provider/', [ + 'timeout' => 10, + 'connect_timeout' => 10, + ]) ->willReturn($response); $this->cache ->expects($this->at(0)) |