Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let background commands actually run in the background #37511

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
333978e
Improve test reliability
fredden May 17, 2023
5b6cb87
Merge remote-tracking branch 'upstream/2.4-develop' into catalog-mftf…
fredden May 30, 2023
7d56fe4
Ensure STDERR remains redirected
fredden May 30, 2023
56aea2c
Avoid race condition in tests with indexers
fredden May 30, 2023
3fc5f63
Use built-in 'magentoCron' instead of 'magentoCLI'
fredden May 30, 2023
000da7e
Fix unit test
fredden May 30, 2023
b769cd4
Modifiying the release tag of magento2-functional-testing-framework
engcom-Charlie Jun 20, 2023
c92cd3f
Merge remote-tracking branch 'upstream/2.4-develop' into catalog-mftf…
fredden Jun 20, 2023
d78b6f8
Revert out-of-scope changes
fredden Jun 20, 2023
a0e419d
Merge remote-tracking branch 'upstream/2.4-develop' into catalog-mftf…
fredden Jul 17, 2023
6c325b8
Run correct cron group for test
fredden Jul 19, 2023
f79de3e
Merge remote-tracking branch 'upstream/2.4-develop' into catalog-mftf…
fredden Aug 18, 2023
91aeb95
Merge remote-tracking branch 'upstream/2.4-develop' into catalog-mftf…
fredden Aug 25, 2023
0e164e1
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
ihor-sviziev Oct 5, 2023
0016a56
Working on the SVC failure
engcom-Charlie Oct 11, 2023
0649271
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
engcom-Charlie Dec 15, 2023
f49addc
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
engcom-Charlie Dec 20, 2023
1729b0b
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
engcom-Charlie Dec 22, 2023
4e89818
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
engcom-Charlie Dec 26, 2023
95c1b1d
Merge branch '2.4-develop' into catalog-mftf-cron-run-reliability
engcom-Charlie Jan 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
<argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
</actionGroup>
<magentoCron stepKey="runCron"/>
<magentoCron groups="default" stepKey="runCron"/>

<actionGroup ref="OpenProductForEditByClickingRowXColumnYInProductGridActionGroup" stepKey="openProductForEdit"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@
<argument name="productName" value="{{_defaultProduct.name}}"/>
</actionGroup>

<!-- Run cron -->
<magentoCron stepKey="runCron" />
<magentoCron stepKey="runCronTwice" />
<!-- We need the 'indexer_update_all_views' job to run. This is the best
way we can make that happen, but there is no guarantee that there is
such a job already scheduled in the queue. -->
<magentoCron groups="index" stepKey="runCron" />
<comment userInput="We need the indexer_update_all_views job to run" stepKey="runCronTwice"/>

<!-- Check product is present in category after cron run -->
<actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
</actionGroup>
<magentoCron stepKey="runCronAfterPlacingOrder"/>
<magentoCron groups="default" stepKey="runCronAfterPlacingOrder"/>

<!-- Get Order id -->
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
Expand All @@ -114,7 +114,7 @@
<!-- Cancel order -->
<actionGroup ref="CancelPendingOrderActionGroup" stepKey="cancelOrder"/>
<waitForPageLoad stepKey="waitForOrderDetailsToLoad"/>
<magentoCron stepKey="runCronAfterCancelingOrder"/>
<magentoCron groups="default" stepKey="runCronAfterCancelingOrder"/>

<!-- Open My Account Page from Customer dropdown -->
<actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="goToMyAccountPage"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public function render($command, array $arguments = [])

return $this->osInfo->isWindows() ?
'start /B "magento background task" ' . $command
: str_replace('2>&1', '> /dev/null &', $command);
: str_replace('2>&1', '2>/dev/null >/dev/null &', $command);
ihor-sviziev marked this conversation as resolved.
Show resolved Hide resolved
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public function commandPerOsTypeDataProvider()
{
return [
'windows' => [true, 'start /B "magento background task" ' . $this->testCommand . ' 2>&1'],
'unix' => [false, $this->testCommand . ' > /dev/null &'],
'unix' => [false, $this->testCommand . ' 2>/dev/null >/dev/null &'],
];
}
}