aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-08 20:37:22 +0100
committerGitHub <noreply@github.com>2016-11-08 20:37:22 +0100
commit05cf1dab4ca7d69a837c2c9e890f078cef76c744 (patch)
tree6eca69cbaa4890ef2e8125931341defb59534b7c /tests
parent100cec59a75f6881b2435a1dc0bac8307d45809e (diff)
parent4393e8003b12c756704455053d436b4d5db22557 (diff)
downloadnextcloud-server-05cf1dab4ca7d69a837c2c9e890f078cef76c744.tar.gz
nextcloud-server-05cf1dab4ca7d69a837c2c9e890f078cef76c744.zip
Merge pull request #2053 from nextcloud/make-sure-we-can-backup-the-command-bus
Make sure the database is not replaced while we make a backup of the …
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/TestCase.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index 61372d4ae90..c1fe9c382fa 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -128,6 +128,10 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
}
protected function setUp() {
+ // overwrite the command bus with one we can run ourselves
+ $this->commandBus = new QueueBus();
+ $this->overwriteService('AsyncCommandBus', $this->commandBus);
+
// detect database access
self::$wasDatabaseAllowed = true;
if (!$this->IsDatabaseAccessAllowed()) {
@@ -140,10 +144,6 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
});
}
- // overwrite the command bus with one we can run ourselves
- $this->commandBus = new QueueBus();
- $this->overwriteService('AsyncCommandBus', $this->commandBus);
-
$traits = $this->getTestTraits();
foreach ($traits as $trait) {
$methodName = 'setUp' . basename(str_replace('\\', '/', $trait));