aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-06-20 14:14:07 +0200
committerGitHub <noreply@github.com>2018-06-20 14:14:07 +0200
commit50df29ded032fb438d9e9eead38519d571eb939a (patch)
treee99f91dee86ff044421f62f5dea37e1fa755e7b5 /tests
parentf9b24cbb23a1d7b9cf6019ee4609d7167a73ae41 (diff)
parent18e9631810ad1d3d72c2b4bbee330169808108ad (diff)
downloadnextcloud-server-50df29ded032fb438d9e9eead38519d571eb939a.tar.gz
nextcloud-server-50df29ded032fb438d9e9eead38519d571eb939a.zip
Merge pull request #9900 from nextcloud/feature/noid/wait-for-cron-to-finish
Wait for cron to finish before running upgrade command
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/UpdaterTest.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/lib/UpdaterTest.php b/tests/lib/UpdaterTest.php
index afc9f9b1f86..02fea9c3c0a 100644
--- a/tests/lib/UpdaterTest.php
+++ b/tests/lib/UpdaterTest.php
@@ -24,6 +24,7 @@ namespace Test;
use OC\Installer;
use OC\Updater;
+use OCP\BackgroundJob\IJobList;
use OCP\IConfig;
use OCP\ILogger;
use OC\IntegrityCheck\Checker;
@@ -39,6 +40,8 @@ class UpdaterTest extends TestCase {
private $checker;
/** @var Installer|\PHPUnit_Framework_MockObject_MockObject */
private $installer;
+ /** @var IJobList|\PHPUnit_Framework_MockObject_MockObject */
+ private $jobList;
public function setUp() {
parent::setUp();
@@ -54,12 +57,16 @@ class UpdaterTest extends TestCase {
$this->installer = $this->getMockBuilder(Installer::class)
->disableOriginalConstructor()
->getMock();
+ $this->jobList = $this->getMockBuilder(IJobList::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->updater = new Updater(
$this->config,
$this->checker,
$this->logger,
- $this->installer
+ $this->installer,
+ $this->jobList
);
}