Skip to content

Commit 827f322

Browse files
committed
Adjust unit test for #19017
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent c7e81c2 commit 827f322

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

tests/lib/InstallerTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function testIsUpdateAvailable(array $appArray, $updateAvailable) {
159159
$this->assertSame($updateAvailable, $installer->isUpdateAvailable('files'), 'Cached result should be returned and fetcher should be only called once');
160160
}
161161

162-
162+
163163
public function testDownloadAppWithRevokedCertificate() {
164164
$this->expectException(\Exception::class);
165165
$this->expectExceptionMessage('Certificate "4112" has been revoked');
@@ -203,7 +203,7 @@ public function testDownloadAppWithRevokedCertificate() {
203203
$installer->downloadApp('news');
204204
}
205205

206-
206+
207207
public function testDownloadAppWithNotNextcloudCertificate() {
208208
$this->expectException(\Exception::class);
209209
$this->expectExceptionMessage('App with id news has a certificate not issued by a trusted Code Signing Authority');
@@ -246,7 +246,7 @@ public function testDownloadAppWithNotNextcloudCertificate() {
246246
$installer->downloadApp('news');
247247
}
248248

249-
249+
250250
public function testDownloadAppWithDifferentCN() {
251251
$this->expectException(\Exception::class);
252252
$this->expectExceptionMessage('App with id news has a cert issued to passman');
@@ -289,7 +289,7 @@ public function testDownloadAppWithDifferentCN() {
289289
$installer->downloadApp('news');
290290
}
291291

292-
292+
293293
public function testDownloadAppWithInvalidSignature() {
294294
$this->expectException(\Exception::class);
295295
$this->expectExceptionMessage('App with id passman has invalid signature');
@@ -347,7 +347,7 @@ public function testDownloadAppWithInvalidSignature() {
347347
$client
348348
->expects($this->once())
349349
->method('get')
350-
->with('https://example.com', ['save_to' => $realTmpFile]);
350+
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
351351
$this->clientService
352352
->expects($this->once())
353353
->method('newClient')
@@ -357,7 +357,7 @@ public function testDownloadAppWithInvalidSignature() {
357357
$installer->downloadApp('passman');
358358
}
359359

360-
360+
361361
public function testDownloadAppWithMoreThanOneFolderDownloaded() {
362362
$this->expectException(\Exception::class);
363363
$this->expectExceptionMessage('Extracted app testapp has more than 1 folder');
@@ -431,7 +431,7 @@ public function testDownloadAppWithMoreThanOneFolderDownloaded() {
431431
$client
432432
->expects($this->once())
433433
->method('get')
434-
->with('https://example.com', ['save_to' => $realTmpFile]);
434+
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
435435
$this->clientService
436436
->expects($this->once())
437437
->method('newClient')
@@ -441,7 +441,7 @@ public function testDownloadAppWithMoreThanOneFolderDownloaded() {
441441
$installer->downloadApp('testapp');
442442
}
443443

444-
444+
445445
public function testDownloadAppWithMismatchingIdentifier() {
446446
$this->expectException(\Exception::class);
447447
$this->expectExceptionMessage('App for id testapp has a wrong app ID in info.xml: testapp1');
@@ -514,7 +514,7 @@ public function testDownloadAppWithMismatchingIdentifier() {
514514
$client
515515
->expects($this->once())
516516
->method('get')
517-
->with('https://example.com', ['save_to' => $realTmpFile]);
517+
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
518518
$this->clientService
519519
->expects($this->once())
520520
->method('newClient')
@@ -593,7 +593,7 @@ public function testDownloadAppSuccessful() {
593593
$client
594594
->expects($this->once())
595595
->method('get')
596-
->with('https://example.com', ['save_to' => $realTmpFile]);
596+
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
597597
$this->clientService
598598
->expects($this->at(0))
599599
->method('newClient')
@@ -606,7 +606,7 @@ public function testDownloadAppSuccessful() {
606606
$this->assertEquals('0.9', \OC_App::getAppVersionByPath(__DIR__ . '/../../apps/testapp/'));
607607
}
608608

609-
609+
610610
public function testDownloadAppWithDowngrade() {
611611
$this->expectException(\Exception::class);
612612
$this->expectExceptionMessage('App for id testapp has version 0.9 and tried to update to lower version 0.8');
@@ -679,7 +679,7 @@ public function testDownloadAppWithDowngrade() {
679679
$client
680680
->expects($this->once())
681681
->method('get')
682-
->with('https://example.com', ['save_to' => $realTmpFile]);
682+
->with('https://example.com', ['save_to' => $realTmpFile, 'timeout' => 120]);
683683
$this->clientService
684684
->expects($this->at(1))
685685
->method('newClient')

0 commit comments

Comments
 (0)