diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-06-21 17:37:44 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2016-06-22 10:29:40 +0200 |
| commit | ec968a48e44159c1bb323d6ea3be3388277d7928 (patch) | |
| tree | 82e5b19284b6f0bef067e4f082f68ca0214d1079 /apps/federatedfilesharing/tests | |
| parent | 3e763ac81e895d2b4af18af2bcd7a31e25da4cf6 (diff) | |
| download | nextcloud-server-ec968a48e44159c1bb323d6ea3be3388277d7928.tar.gz nextcloud-server-ec968a48e44159c1bb323d6ea3be3388277d7928.zip | |
Increase fed share timeout from 3 to 10 + unit tests
Diffstat (limited to 'apps/federatedfilesharing/tests')
| -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)) |