Skip to content

Dont fork new processes in Unish's drush() method #3696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Dont fork new processes in Unish's drush() method #3696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2a318
Dont fork new processes in Unish's drush() method
weitzman Sep 22, 2018
a7a8bd0
Remove escapeshellarg and reset drush context
weitzman Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 30 additions & 41 deletions tests/CommandUnishTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

namespace Unish;

use Drush\Config\Environment;
use Drush\Drush;
use Drush\Preflight\Preflight;
use Drush\Runtime\Runtime;
use Symfony\Component\Process\Process;
use Symfony\Component\Process\Exception\ProcessTimedOutException;
use PHPUnit\Framework\TestResult;
use Webmozart\PathUtil\Path;

abstract class CommandUnishTestCase extends UnishTestCase
{
Expand All @@ -14,13 +18,6 @@ abstract class CommandUnishTestCase extends UnishTestCase
const EXIT_ERROR = 1;
const UNISH_EXITCODE_USER_ABORT = 75; // Same as DRUSH_EXITCODE_USER_ABORT

/**
* Code coverage data collected during a single test.
*
* @var array
*/
protected $coverage_data = [];

/**
* Process of last executed command.
*
Expand Down Expand Up @@ -330,7 +327,7 @@ public function drush($command, array $args = [], array $options = [], $site_spe
if (!isset($value)) {
$cmd[] = "--$key";
} else {
$cmd[] = "--$key=" . self::escapeshellarg($value);
$cmd[] = "--$key=" . $value;
}
}
}
Expand All @@ -340,55 +337,47 @@ public function drush($command, array $args = [], array $options = [], $site_spe
}
$cmd[] = "--no-interaction";

// Insert code coverage argument before command, in order for it to be
// parsed as a global option. This matters for commands like ssh and rsync
// where options after the command are passed along to external commands.
$result = $this->getTestResultObject();
if ($result->getCollectCodeCoverageInformation()) {
$coverage_file = tempnam($this->getSandbox(), 'drush_coverage');
if ($coverage_file) {
$cmd[] = "--drush-coverage=" . $coverage_file;
}
}

// Insert site specification and drush command.
$cmd[] = empty($site_specification) ? null : self::escapeshellarg($site_specification);
$cmd[] = empty($site_specification) ? null : $site_specification;
$cmd[] = $command;

// Insert drush command arguments.
foreach ($args as $arg) {
$cmd[] = self::escapeshellarg($arg);
$cmd[] = $arg;
}
// insert drush command options
// Insert drush command options
foreach ($options as $key => $value) {
if (!isset($value)) {
$cmd[] = "--$key";
} else {
$cmd[] = "--$key=" . self::escapeshellarg($value);
$cmd[] = "--$key=" . $value;
}
}

$cmd[] = $suffix;
if ($hide_stderr) {
// @todo deal with $hide_stderr
if (0 && $hide_stderr) {
$cmd[] = '2>' . $this->bitBucket();
}
$exec = array_filter($cmd, 'strlen'); // Remove NULLs
// Set sendmail_path to 'true' to disable any outgoing emails
// that tests might cause Drupal to send.

$php_options = (array_key_exists('PHP_OPTIONS', $env)) ? $env['PHP_OPTIONS'] . " " : "";
// @todo The PHP Options below are not yet honored by execute(). See .travis.yml for an alternative way.
$env['PHP_OPTIONS'] = "${php_options}-d sendmail_path='true'";
$cmd = implode(' ', $exec);
$return = $this->execute($cmd, $expected_return, $cd, $env);

// Save code coverage information.
if (!empty($coverage_file)) {
$data = unserialize(file_get_contents($coverage_file));
unlink($coverage_file);
// Save for appending after the test finishes.
$this->coverage_data[] = $data;
}

$this->log('Drush called: ' . implode(' ', $cmd));

// Set up environment
$loader = require PHPUNIT_COMPOSER_INSTALL;
$environment = new Environment(Path::getHomeDirectory(), $cd ?: getcwd(), PHPUNIT_COMPOSER_INSTALL);
$environment->setConfigFileVariant(Drush::getMajorVersion());
$environment->setLoader($loader);
$environment->applyEnvironment();

// Preflight and run.
$preflight = new Preflight($environment);
$runtime = new Runtime($preflight);
$return = $runtime->run($cmd);

// Empty Drush's legacy context system
$cache = &drush_get_context();
$cache = [];

return $return;
}
Expand Down