From 3b249f19677996cf0b83e82b663b09254160898e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 27 Oct 2015 21:25:11 +0100
Subject: [PATCH] Revert "setting to skip migration tests by default"
This reverts commit 7cbdd9b90bcea3566b7d0198f23da3d427e6ef45.
---
config/config.sample.php | 9 ---------
core/ajax/update.php | 11 +----------
core/command/upgrade.php | 6 ------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
index 57ab586cb2f..288e3a01cff 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1152,15 +1152,6 @@ $CONFIG = array(
*/
'debug' => false,
-/**
- * Skips the migration test during upgrades
- *
- * If this is set to true the migration test are deactivated during upgrade.
- * This is only recommended in installations where upgrade tests are run in
- * advance with the same data on a test system.
- */
-'update.skip-migration-test' => false,
-
/**
* This entry is just here to show a warning in case somebody copied the sample
* configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION!
diff --git a/core/ajax/update.php b/core/ajax/update.php
index d6dfa071090..54038a479fb 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -42,21 +42,12 @@ if (OC::checkUpgrade(false)) {
// avoid side effects
\OC_User::setIncognitoMode(true);
-
-
$logger = \OC::$server->getLogger();
- $config = \OC::$server->getConfig();
$updater = new \OC\Updater(
\OC::$server->getHTTPHelper(),
- $config,
+ \OC::$server->getConfig(),
$logger
);
-
- if ($config->getSystemValue('update.skip-migration-test', false)) {
- $eventSource->send('success', (string)$l->t('Migration tests are skipped - "update.skip-migration-test" is activated in config.php'));
- $updater->setSimulateStepEnabled(false);
- }
-
$incompatibleApps = [];
$disabledThirdPartyApps = [];
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 9c313f83e14..d1a7c09c30c 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -96,12 +96,6 @@ class Upgrade extends Command {
$updateStepEnabled = true;
$skip3rdPartyAppsDisable = false;
- if ($this->config->getSystemValue('update.skip-migration-test', false)) {
- $output->writeln(
- '<info>"skip-migration-test" is activated via config.php</info>'
- );
- $simulateStepEnabled = false;
- }
if ($input->getOption('skip-migration-test')) {
$simulateStepEnabled = false;
}
--
GitLab