Skip to content

Commit 8a46f66

Browse files
Merge remote-tracking branch '35948/qa-integration-tests-setup-hangs' into comm_78764_36529
2 parents 073beab + fd26ca9 commit 8a46f66

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

dev/tests/integration/framework/Magento/TestFramework/Application.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ public function cleanup()
525525
* @see \Magento\Setup\Mvc\Bootstrap\InitParamListener::BOOTSTRAP_PARAM
526526
*/
527527
$this->_shell->execute(
528-
PHP_BINARY . ' -f %s setup:uninstall -vvv -n --magento-init-params=%s',
528+
PHP_BINARY . ' -f %s setup:uninstall --no-interaction -vvv -n --magento-init-params=%s',
529529
[BP . '/bin/magento', $this->getInitParamsQuery()]
530530
);
531531
}
@@ -551,6 +551,7 @@ public function install($cleanup)
551551
$this->copyGlobalConfigFile();
552552

553553
$installParams = $this->getInstallCliParams();
554+
$installParams['--no-interaction'] = true;
554555

555556
// performance optimization: restore DB from last good dump to make installation on top of it (much faster)
556557
// do not restore from the database if the cleanup option is set to ensure we have a clean DB to test on
@@ -609,7 +610,9 @@ protected function runPostInstallCommands()
609610
$command = $postInstallSetupCommand['command'];
610611
$argumentsAndOptions = $postInstallSetupCommand['config'];
611612

612-
$argumentsAndOptionsPlaceholders = [];
613+
$argumentsAndOptionsPlaceholders = [
614+
'--no-interaction'
615+
];
613616

614617
foreach (array_keys($argumentsAndOptions) as $key) {
615618
$isArgument = is_numeric($key);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ApplicationTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function installDataProvider()
183183
$installShellCommandExpectation = [
184184
PHP_BINARY . ' -f %s setup:install -vvv ' .
185185
'--db-host=%s --db-user=%s --db-password=%s --db-name=%s --db-prefix=%s ' .
186-
'--use-secure=%s --use-secure-admin=%s --magento-init-params=%s',
186+
'--use-secure=%s --use-secure-admin=%s --magento-init-params=%s --no-interaction',
187187
[
188188
BP . '/bin/magento',
189189
'/tmp/mysql.sock',
@@ -194,6 +194,7 @@ public function installDataProvider()
194194
'0',
195195
'0',
196196
$this->getInitParamsQuery(sys_get_temp_dir()),
197+
true
197198
]
198199
];
199200

@@ -213,7 +214,7 @@ public function installDataProvider()
213214
[
214215
$installShellCommandExpectation,
215216
[
216-
PHP_BINARY . ' -f %s %s -vvv ' .
217+
PHP_BINARY . ' -f %s %s -vvv --no-interaction ' .
217218
'--host=%s --dbname=%s --username=%s --password=%s --magento-init-params=%s',
218219
[
219220
BP . '/bin/magento',
@@ -234,7 +235,7 @@ public function installDataProvider()
234235
[
235236
$installShellCommandExpectation,
236237
[
237-
PHP_BINARY . ' -f %s %s -vvv %s %s --option1=%s -option2=%s --magento-init-params=%s',
238+
PHP_BINARY . ' -f %s %s -vvv --no-interaction %s %s --option1=%s -option2=%s --magento-init-params=%s', // phpcs:ignore
238239
[
239240
BP . '/bin/magento',
240241
'fake:command',

0 commit comments

Comments
 (0)