B2B-1876: New directories in pub/media do not get synced back to local filesystem from S3 Remote Storage

- Fix unit test failure

Author: joanhe

setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

@@ -112,14 +112,18 @@ public function testExecute($options, $deployMode, $expectedString, $expectedOpt
             ->method('installDataFixtures');
 
         $this->assertSame(Cli::RETURN_SUCCESS, $this->commandTester->execute($options));
-        $this->assertStringContainsString($expectedString, $this->commandTester->getDisplay());
+        $this->assertEquals($expectedString, $this->commandTester->getDisplay());
     }
 
     /**
      * @return array
      */
     public function executeDataProvider()
     {
+        $mediaGalleryNotice = "Media files stored outside of 'Media Gallery Allowed' folders will not be available "
+        . "to the media gallery.\n"
+        . "Please refer to Developer Guide for more details.\n";
+
         return [
             [
                 'options' => [
@@ -128,7 +132,7 @@ public function executeDataProvider()
                 ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
                 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
-                    . PHP_EOL,
+                    . PHP_EOL . $mediaGalleryNotice,
                 'expectedOptions' => [
                     'keep-generated' => false,
                     'convert-old-scripts' => false,
@@ -145,7 +149,7 @@ public function executeDataProvider()
                     '--keep-generated' => true,
                 ],
                 'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
-                'expectedString' => '',
+                'expectedString' => $mediaGalleryNotice,
                 'expectedOptions' => [
                     'keep-generated' => true,
                     'convert-old-scripts' => false,
@@ -158,7 +162,7 @@ public function executeDataProvider()
             [
                 'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
                 'deployMode' => \Magento\Framework\App\State::MODE_DEVELOPER,
-                'expectedString' => '',
+                'expectedString' => $mediaGalleryNotice,
                 'expectedOptions' => [
                     'keep-generated' => false,
                     'convert-old-scripts' => false,
@@ -171,7 +175,7 @@ public function executeDataProvider()
             [
                 'options' => ['--magento-init-params' => '', '--convert-old-scripts' => false],
                 'deployMode' => \Magento\Framework\App\State::MODE_DEFAULT,
-                'expectedString' => '',
+                'expectedString' => $mediaGalleryNotice,
                 'expectedOptions' => [
                     'keep-generated' => false,
                     'convert-old-scripts' => false,