Merge pull request #21388 from nextcloud/backport/21380/stable18

[stable18] Increase timeout of the appstore requests
nextcloud · Jul 4, 2020 · c9eede0 · c9eede0
2 parents 1cc8cb5 + b5a6432
commit c9eede0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -96,7 +96,7 @@ protected function fetch($ETag, $content) {
 		}
 
 		$options = [
-			'timeout' => 10,
+			'timeout' => 60,
 			'headers' => ['Accept-Encoding' => 'gzip'],
 		];
 

diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php
@@ -252,7 +252,7 @@ public function testGetWithAlreadyExistingFileAndOutdatedTimestamp() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 					]
@@ -353,7 +353,7 @@ public function testGetWithAlreadyExistingFileAndNoVersion() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 					]
@@ -449,7 +449,7 @@ public function testGetWithAlreadyExistingFileAndOutdatedVersion() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 					]
@@ -522,7 +522,7 @@ public function testGetWithExceptionInClient() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 					]
@@ -582,7 +582,7 @@ public function testGetMatchingETag() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 						'If-None-Match' => '"myETag"',
@@ -655,7 +655,7 @@ public function testGetNoMatchingETag() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 						'If-None-Match' => '"myETag"',
@@ -743,7 +743,7 @@ public function testFetchAfterUpgradeNoETag() {
 			->with(
 				$this->equalTo($this->endpoint),
 				$this->equalTo([
-					'timeout' => 10,
+					'timeout' => 60,
 					'headers' => [
 						'Accept-Encoding' => 'gzip',
 					],