MC-21994: Integration Test failure: UploadTest::testUploadActionWithErrors

Author: danmooney2

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -89,11 +89,6 @@ public function execute()
                 ['fileId' => 'image']
             );
             $uploader->setAllowedExtensions($this->getAllowedExtensions());
-
-            if (!$uploader->checkMimeType($this->getAllowedMimeTypes())) {
-                throw new LocalizedException(__('Disallowed File Type.'));
-            }
-
             $imageAdapter = $this->adapterFactory->create();
             $uploader->addValidateCallback('catalog_product_image', $imageAdapter, 'validateUploadFile');
             $uploader->setAllowRenameFiles(true);
@@ -133,14 +128,4 @@ private function getAllowedExtensions()
     {
         return array_keys($this->allowedMimeTypes);
     }
-
-    /**
-     * Get the set of allowed mime types.
-     *
-     * @return array
-     */
-    private function getAllowedMimeTypes()
-    {
-        return array_values($this->allowedMimeTypes);
-    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php

@@ -154,8 +154,6 @@ public function uploadActionDataProvider(): array
      */
     public function testUploadActionWithErrors(array $file, array $expectation): void
     {
-        $this->markTestSkipped('MC-21994');
-
         if (!empty($file['create_file'])) {
             $this->createFileInSysTmpDir($file['name']);
         } elseif (!empty($file['copy_file'])) {
@@ -165,8 +163,8 @@ public function testUploadActionWithErrors(array $file, array $expectation): voi
         $this->getRequest()->setMethod($this->httpMethod);
         $this->dispatch($this->uri);
         $jsonBody = $this->serializer->unserialize($this->getResponse()->getBody());
-        $this->assertEquals($jsonBody['error'], $expectation['message']);
-        $this->assertEquals($jsonBody['errorcode'], $expectation['errorcode']);
+        $this->assertEquals($expectation['message'], $jsonBody['error']);
+        $this->assertEquals($expectation['errorcode'], $jsonBody['errorcode']);
 
         if (!empty($expectation['tmp_media_path'])) {
             $this->assertFileNotExists(