Merge branch 'MC-41153' into 2.3.7-develop-2.3-develop-sync-030921

Author: dvoskoboinikov

dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php

@@ -157,12 +157,15 @@ public function testProcessCustomerValue()
      * Test for processCustomerValue method with invalid value
      *
      * @magentoAppIsolation enabled
-     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @throws FileSystemException
      * @throws \ReflectionException
      */
     public function testProcessCustomerInvalidValue()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\ValidatorException::class
+        );
+
         $this->mediaDirectory->delete('customer');
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
         $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);