12696 Don't delete test module files if tests are run in parallel

Without this check, the module files were deleted when the first test
runner finishs. The second test runner might still need the module files.

Author: avstudnitz

dev/tests/integration/framework/bootstrap.php

@@ -19,15 +19,15 @@
     define('INTEGRATION_TESTS_DIR', $testsBaseDir);
 }
 
-$testFrameworkDir = __DIR__;
-require_once 'deployTestModules.php';
-
 try {
     setCustomErrorHandler();
 
     /* Bootstrap the application */
     $settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
 
+    $testFrameworkDir = __DIR__;
+    require_once 'deployTestModules.php';
+
     if ($settings->get('TESTS_EXTRA_VERBOSE_LOG')) {
         $filesystem = new \Magento\Framework\Filesystem\Driver\File();
         $exceptionHandler = new \Magento\Framework\Logger\Handler\Exception($filesystem);

dev/tests/integration/framework/deployTestModules.php

@@ -5,7 +5,8 @@
  */
 
 /**
- * @var $testFrameworkDir string - Must be defined in parent script.
+ * @var string $testFrameworkDir - Must be defined in parent script.
+ * @var \Magento\TestFramework\Bootstrap\Settings $settings - Must be defined in parent script.
  */
 
 /** Copy test modules to app/code/Magento to make them visible for Magento instance */
@@ -39,7 +40,10 @@
     include $file;
 }
 
-register_shutdown_function('deleteTestModules', $pathToCommittedTestModules, $pathToInstalledMagentoInstanceModules);
+if (!$settings->get('TESTS_PARALLEL_THREAD', 0)) {
+    // Only delete modules if we are not using parallel executions
+    register_shutdown_function('deleteTestModules', $pathToCommittedTestModules, $pathToInstalledMagentoInstanceModules);
+}
 
 /**
  * Delete all test module directories which have been created before