diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-10-20 09:21:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 09:21:51 +0200 |
| commit | ffd76d05c99fae4da9b1cc11859dd31e6e50113d (patch) | |
| tree | b529fd434897896e5a58947be266fd6e106d3eb5 /tests | |
| parent | f116595b3f98e5cfd1791e44364e03249cd55c5e (diff) | |
| parent | 4512c73293c8843173857c825b5c1c400788f5ec (diff) | |
| download | nextcloud-server-ffd76d05c99fae4da9b1cc11859dd31e6e50113d.tar.gz nextcloud-server-ffd76d05c99fae4da9b1cc11859dd31e6e50113d.zip | |
Merge pull request #23374 from nextcloud/bugfix/noid/app-fetch-retry
Only retry fetching app store data once every 5 minutes in case it fails
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/App/AppStore/Fetcher/FetcherBase.php | 111 |
1 files changed, 36 insertions, 75 deletions
diff --git a/tests/lib/App/AppStore/Fetcher/FetcherBase.php b/tests/lib/App/AppStore/Fetcher/FetcherBase.php index c3d9ec43cc4..531fdf41e78 100644 --- a/tests/lib/App/AppStore/Fetcher/FetcherBase.php +++ b/tests/lib/App/AppStore/Fetcher/FetcherBase.php @@ -120,32 +120,19 @@ abstract class FetcherBase extends TestCase { public function testGetWithNotExistingFileAndUpToDateTimestampAndVersion() { $this->config - ->expects($this->at(0)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(1)) - ->method('getSystemValue') - ->with('has_internet_connection', true) - ->willReturn(true); - $this->config - ->expects($this->at(2)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(3)) ->method('getSystemValue') - ->with('appstoreurl', 'https://apps.nextcloud.com/api/v1') - ->willReturn('https://apps.nextcloud.com/api/v1'); - $this->config - ->expects($this->at(4)) - ->method('getSystemValue') - ->with( - $this->equalTo('version'), - $this->anything() - )->willReturn('11.0.0.2'); + ->willReturnCallback(function ($var, $default) { + if ($var === 'appstoreenabled') { + return true; + } elseif ($var === 'has_internet_connection') { + return true; + } elseif ($var === 'appstoreurl') { + return 'https://apps.nextcloud.com/api/v1'; + } elseif ($var === 'version') { + return '11.0.0.2'; + } + return $default; + }); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -286,32 +273,19 @@ abstract class FetcherBase extends TestCase { public function testGetWithAlreadyExistingFileAndNoVersion() { $this->config - ->expects($this->at(0)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(1)) - ->method('getSystemValue') - ->with('has_internet_connection', true) - ->willReturn(true); - $this->config - ->expects($this->at(2)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(3)) ->method('getSystemValue') - ->with('appstoreurl', 'https://apps.nextcloud.com/api/v1') - ->willReturn('https://apps.nextcloud.com/api/v1'); - $this->config - ->expects($this->at(4)) - ->method('getSystemValue') - ->with( - $this->equalTo('version'), - $this->anything() - )->willReturn('11.0.0.2'); + ->willReturnCallback(function ($var, $default) { + if ($var === 'appstoreenabled') { + return true; + } elseif ($var === 'has_internet_connection') { + return true; + } elseif ($var === 'appstoreurl') { + return 'https://apps.nextcloud.com/api/v1'; + } elseif ($var === 'version') { + return '11.0.0.2'; + } + return $default; + }); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); @@ -375,32 +349,19 @@ abstract class FetcherBase extends TestCase { public function testGetWithAlreadyExistingFileAndOutdatedVersion() { $this->config - ->expects($this->at(0)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(1)) ->method('getSystemValue') - ->with('has_internet_connection', true) - ->willReturn(true); - $this->config - ->expects($this->at(2)) - ->method('getSystemValue') - ->with('appstoreenabled', true) - ->willReturn(true); - $this->config - ->expects($this->at(3)) - ->method('getSystemValue') - ->with('appstoreurl', 'https://apps.nextcloud.com/api/v1') - ->willReturn('https://apps.nextcloud.com/api/v1'); - $this->config - ->expects($this->at(4)) - ->method('getSystemValue') - ->with( - $this->equalTo('version'), - $this->anything() - )->willReturn('11.0.0.2'); + ->willReturnCallback(function ($var, $default) { + if ($var === 'appstoreenabled') { + return true; + } elseif ($var === 'has_internet_connection') { + return true; + } elseif ($var === 'appstoreurl') { + return 'https://apps.nextcloud.com/api/v1'; + } elseif ($var === 'version') { + return '11.0.0.2'; + } + return $default; + }); $folder = $this->createMock(ISimpleFolder::class); $file = $this->createMock(ISimpleFile::class); |