[Pkg-owncloud-commits] [owncloud] 106/129: Revert "setting to skip migration tests by default"

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 99b26d69167762bdb05b5d50f356df2fde516b7b
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Oct 27 21:25:11 2015 +0100

    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 57ab586..288e3a0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1153,15 +1153,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 dfec64c..8b728a4 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -41,21 +41,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 9c313f8..d1a7c09 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;
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git