Merge branch '2.4-develop' into functional-mainline-pr-ce

Author: manjusha729

app/code/Magento/AwsS3/Test/Mftf/Test/AdminAwsS3SyncZeroByteFilesTest.xml

@@ -44,11 +44,11 @@
             <!-- Disable AWS S3 Remote Storage -->
             <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
         </after>
-        <magentoCLI command="remote-storage:sync" timeout="120" stepKey="syncRemoteStorage"/>
-        <assertEquals stepKey="assertConfigTest">
-            <expectedResult type="string">Uploading media files to remote storage.\n- empty.jpg\nEnd of upload.</expectedResult>
+        <magentoCLI command="remote-storage:sync" timeout="200" stepKey="syncRemoteStorage"/>
+        <comment userInput="checking remote-storage:sync" stepKey="assertConfigTest"/>
+        <assertStringContainsString stepKey="checkingRemoteStorageSync">
+            <expectedResult type="string">Uploading media files to remote storage</expectedResult>
             <actualResult type="variable">$syncRemoteStorage</actualResult>
-        </assertEquals>
-
+        </assertStringContainsString>
     </test>
 </tests>