Skip to content

Commit 0bf43e0

Browse files
authored
Merge branch 'develop' into master
2 parents 04a17f4 + 44e94d4 commit 0bf43e0

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/Magento/FunctionalTestingFramework/Allure/AllureHelper.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ class AllureHelper
2323
public static function addAttachmentToCurrentStep($data, $caption): void
2424
{
2525
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+
}
2731
}
2832
if (@file_exists($data) && is_file($data)) {
2933
Allure::attachmentFile($caption, $data);

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,6 +1033,10 @@ private function executeCronjobs($cronGroups, $timeout, $arguments): string
10331033
{
10341034
$cronGroups = array_filter($cronGroups);
10351035

1036+
if (isset($cronGroups[0]) && !isset($cronGroups[1])) {
1037+
$arguments .= ' --bootstrap=standaloneProcessStarted=1';
1038+
}
1039+
10361040
$waitFor = $this->getCronWait($cronGroups);
10371041

10381042
if ($waitFor) {

0 commit comments

Comments
 (0)