Skip to content

Sync develop and master branches #577

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.

Sign up for GitHub

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

Merged
merged 26 commits into from
Feb 6, 2020
Merged

Sync develop and master branches #577

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bb38719
updated Contribution Guidelines link
hickskenh Jan 24, 2020
d5ce8ae
Merge pull request #559 from hickskenh/patch-1
okolesnyk Jan 28, 2020
8266748
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
jilu1 Jan 30, 2020
a1adbc1
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
jilu1 Jan 30, 2020
ac9f32c
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
jilu1 Jan 30, 2020
6deb625
Merge pull request #564 from magento/MQE-1969
jilu1 Jan 30, 2020
9f16107
Merge remote-tracking branch 'origin/MFTF-2.6.0-RC' into MQE-1970
jilu1 Jan 30, 2020
6635201
Merge pull request #565 from magento/MQE-1970
KevinBKozan Jan 31, 2020
2284db9
Fix include
dobooth Jan 31, 2020
066465a
Merge pull request #566 from magento/dobooth-patch-1
KevinBKozan Jan 31, 2020
93fda6b
Adding raw tag.
dobooth Jan 31, 2020
c589521
Merge pull request #569 from magento/dobooth-patch-2
KevinBKozan Jan 31, 2020
c8bb2de
Adding deprecation attribute info
dobooth Jan 31, 2020
016cee6
Moving def to correct table
dobooth Feb 3, 2020
1b0cf43
Fixed table
dobooth Feb 3, 2020
7560bc3
First cron run may fail when no Group provided.
lbajsarowicz Feb 4, 2020
62c3a58
Removing attribute
dobooth Feb 4, 2020
f2d0905
Added `deprecated` to metadata topic
dobooth Feb 4, 2020
5494d10
Merge branch 'db_deprecation' of github.com:magento-devdocs/magento2-…
dobooth Feb 4, 2020
96413c4
Added attribute.
dobooth Feb 4, 2020
d7efde8
Merge pull request #572 from magento-devdocs/db_deprecation
okolesnyk Feb 4, 2020
3ccf894
Merge pull request #573 from lbajsarowicz/fix/magentocron-no-group-pr…
okolesnyk Feb 4, 2020
15f8304
Bump MFTF dependencies
okolesnyk Feb 4, 2020
ce9ddad
Merge pull request #574 from magento/bumpdeps
okolesnyk Feb 5, 2020
3609f4f
MQE-1969: Updated CHANGELOG.md and bumped MFTF package version
okolesnyk Feb 5, 2020
51f1c51
Merge branch 'develop' into masternew
okolesnyk Feb 5, 2020
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
Prev Previous commit
Next Next commit
First cron run may fail when no Group provided.
  • Loading branch information
@lbajsarowicz
lbajsarowicz committed Feb 4, 2020
commit 7560bc3d0c804c3ab6c7c0adba9df8ca87a8dc61
6 changes: 5 additions & 1 deletion src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,10 @@ private function notifyCronFinished(array $cronGroups = [])
*/
private function getLastCronExecution(array $cronGroups = [])
{
if (empty($this->cronExecution)) {
return 0;
}

if (empty($cronGroups)) {
return (int)max($this->cronExecution);
}
Expand Down Expand Up @@ -1060,7 +1064,7 @@ public function getSecret($key)
/**
* Waits proper amount of time to perform Cron execution
*
* @param string $cronGroups
* @param array $cronGroups
* @param integer $timeout
* @param string $arguments
* @return string
Expand Down