MAGETWO-82003: Ensure database is cleared/Magento reinstalled when TESTS_CLEANUP is enabled #11499

Author: Oleksii Korshenko

dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php

@@ -25,10 +25,13 @@ public function run()
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function install($cleanup)
     {
+        if ($cleanup) {
+            $this->cleanup();
+        }
+
         $installOptions = $this->getInstallConfig();
 
         /* Install application */

dev/tests/api-functional/framework/bootstrap.php

@@ -58,10 +58,8 @@
     );
 
     if (defined('TESTS_MAGENTO_INSTALLATION') && TESTS_MAGENTO_INSTALLATION === 'enabled') {
-        if (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled') {
-            $application->cleanup();
-        }
-        $application->install();
+        $cleanup = (defined('TESTS_CLEANUP') && TESTS_CLEANUP === 'enabled');
+        $application->install($cleanup);
     }
 
     $bootstrap = new \Magento\TestFramework\Bootstrap(