Merge branch 'develop' into cron-wait-group

manjusha729 · web-flow · commit 1bbdbf1c2b43 · 2023-06-14T12:57:11.000+05:30
diff --git a/src/Magento/FunctionalTestingFramework/Allure/AllureHelper.php b/src/Magento/FunctionalTestingFramework/Allure/AllureHelper.php
@@ -23,7 +23,11 @@ class AllureHelper
     public static function addAttachmentToCurrentStep($data, $caption): void
     {
         if (!is_string($data)) {
-            $data = serialize($data);
+            try {
+                $data = serialize($data);
+            } catch (\Exception $exception) {
+                throw  new \Exception($data->getMessage());
+            }
         }
         if (@file_exists($data) && is_file($data)) {
             Allure::attachmentFile($caption, $data);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,11 @@ class AllureHelper`
`23`	`23`	`public static function addAttachmentToCurrentStep($data, $caption): void`
`24`	`24`	`{`
`25`	`25`	`if (!is_string($data)) {`
`26`		`- $data = serialize($data);`
	`26`	`+ try {`
	`27`	`+ $data = serialize($data);`
	`28`	`+ } catch (\Exception $exception) {`
	`29`	`+ throw new \Exception($data->getMessage());`
	`30`	`+ }`
`27`	`31`	`}`
`28`	`32`	`if (@file_exists($data) && is_file($data)) {`
`29`	`33`	`Allure::attachmentFile($caption, $data);`