MC-30236: Upgrade from 2.3.x CE with SD to 2.3.x EE AreaCode Exception

- fix unit and integration tests

Author: krissyhiserote

setup/src/Magento/Setup/Model/Installer.php

@@ -1261,7 +1261,7 @@ public function uninstall()
     }
 
     /**
-     * Enable or disable caches for specific types
+     * Enable or disable caches for specific types that are available
      *
      * If no types are specified then it will enable or disable all available types
      * Note this is called by install() via callback.
@@ -1275,9 +1275,10 @@ private function updateCaches($isEnabled, $types = [])
         /** @var \Magento\Framework\App\Cache\Manager $cacheManager */
         $cacheManager = $this->objectManagerProvider->get()->create(\Magento\Framework\App\Cache\Manager::class);
 
-        $types = empty($types) ? $cacheManager->getAvailableTypes() : $types;
+        $availableTypes = $cacheManager->getAvailableTypes();
+        $types = empty($types) ? $availableTypes : array_intersect($availableTypes, $types);
         $enabledTypes = $cacheManager->setEnabled($types, $isEnabled);
-        if($isEnabled){
+        if ($isEnabled) {
             $cacheManager->clean($enabledTypes);
         }
 

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -307,8 +307,9 @@ public function testInstall(array $request, array $logMessages)
             $dataSetup->expects($this->any())->method('getConnection')->willReturn($connection);
             $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
             $cacheManager->expects($this->any())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
-            $cacheManager->expects($this->once())->method('setEnabled')->willReturn(['foo', 'bar']);
-            $cacheManager->expects($this->any())->method('clean');
+            $cacheManager->expects($this->exactly(3))->method('setEnabled')->willReturn(['foo', 'bar']);
+            $cacheManager->expects($this->exactly(3))->method('clean');
+            $cacheManager->expects($this->exactly(3))->method('getStatus')->willReturn([]);
             $appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
                 ->disableOriginalConstructor()
                 ->disableArgumentCloning()
@@ -410,15 +411,21 @@ public function installDataProvider()
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],
-                        [''],
+                        [print_r([],true)],
                         ['Installing data...'],
                         ['Data install/update:'],
+                        ['Disabling caches:'],
+                        ['Current status:'],
+                        [print_r([],true)],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Data post-updates:'],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         //['Installing admin user...'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [print_r([],true)],
                         ['Caches clearing:'],
                         ['Cache cleared successfully'],
                         ['Disabling Maintenance Mode:'],
@@ -456,14 +463,20 @@ public function installDataProvider()
                         ['Installing user configuration...'],
                         ['Enabling caches:'],
                         ['Current status:'],
-                        [''],
+                        [print_r([],true)],
                         ['Installing data...'],
                         ['Data install/update:'],
+                        ['Disabling caches:'],
+                        ['Current status:'],
+                        [print_r([],true)],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
                         ['Data post-updates:'],
                         ['Module \'Foo_One\':'],
                         ['Module \'Bar_Two\':'],
+                        ['Enabling caches:'],
+                        ['Current status:'],
+                        [print_r([],true)],
                         ['Installing admin user...'],
                         ['Caches clearing:'],
                         ['Cache cleared successfully'],