Fixes acquia#1572: Failing Behat Test Hangs Pipelines Build. (acquia#1575)

Author: grasmash

src/Robo/Commands/Deploy/DeployCommand.php

@@ -565,15 +565,11 @@ public function updateSites() {
       $this->config->set('drush.uri', $multisite);
 
       $status_code = $this->invokeCommand('setup:config-import');
-      if (!$status_code) {
-        return $status_code;
-      }
       $status_code = $this->invokeCommand('setup:toggle-modules');
-      if (!$status_code) {
-        return $status_code;
-      }
 
       $this->say("Finished deploying updates to $multisite.");
+
+      return $status_code;
     }
   }
 

src/Robo/Commands/Tests/BehatCommand.php

@@ -89,9 +89,11 @@ public function behat() {
     $this->createReportsDir();
     $this->launchWebServer();
     $this->launchWebDriver();
-    $this->executeBehatTests();
+    $behat_exit_code = $this->executeBehatTests();
     $this->killWebDriver();
     $this->killWebServer();
+
+    return $behat_exit_code;
   }
 
   /**
@@ -254,6 +256,8 @@ public function setupPhantomJs() {
    *   Throws an exception if any Behat test fails.
    */
   protected function executeBehatTests() {
+    $exit_code = 0;
+
     foreach ($this->getConfigValue('behat.paths') as $behat_path) {
       // Output errors.
       // @todo replace base_url in behat config when internal server is being used.
@@ -281,9 +285,11 @@ protected function executeBehatTests() {
       $result = $task->run();
 
       if (!$result->wasSuccessful()) {
-        throw new \Exception("Behat tests failed");
+        return $result->getExitCode();
       }
     }
+
+    return $exit_code;
   }
 
 }

src/Robo/Commands/Vm/VmCommand.php

@@ -212,7 +212,7 @@ protected function boot() {
    * @throws \Exception
    */
   protected function requireDrupalVm() {
-    $this->say("Adding geerlingguy/drupal-vm:{$this->drupalVmVersionConstraint} to composer.json's require-dev array.");
+    $this->say("Adding geerlingguy/drupal-vm:{$this->drupalVmVersionConstraint} to composer.json's require-dev array...");
     $result = $this->taskExec("composer require --dev geerlingguy/drupal-vm:{$this->drupalVmVersionConstraint}")
       ->dir($this->getConfigValue('repo.root'))
       ->printOutput(TRUE)
@@ -262,8 +262,8 @@ protected function checkRequirements() {
    *   Drupal VM config from box/config.yml.
    */
   protected function validateConfig($config) {
-    if (strstr($config['machine_name'], '_')) {
-      $this->logger->warning("The machine name for your Drupal VM should not contain an underscore.");
+    if (strstr($config['vagrant_machine_name'], '_')) {
+      $this->logger->warning("vagrant_machine_namefor should not contain an underscore.");
     }
   }