From f039692292ce643ae9382575c8757912f0596e1b Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Thu, 21 Nov 2019 09:09:25 -0600 Subject: [PATCH 1/2] MQE-1774: Review community PR #343 Fix for pipeline step failures on execution of bin/magento from WebDriver. --- .../Module/MagentoWebDriver.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php index 215438420..f057cf171 100644 --- a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php +++ b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php @@ -517,11 +517,13 @@ public function scrollToTopOfPage() */ public function magentoCLI($command, $arguments = null) { - try { - return $this->shellExecMagentoCLI($command, $arguments); - } catch (\Exception $exception) { - return $this->curlExecMagentoCLI($command, $arguments); - } + return $this->curlExecMagentoCLI($command, $arguments); + //TODO: calling bin/magento from pipeline is timing out, needs investigation (ref: MQE-1774) +// try { +// return $this->shellExecMagentoCLI($command, $arguments); +// } catch (\Exception $exception) { +// return $this->curlExecMagentoCLI($command, $arguments); +// } } /** From de5bed6e36162c2dd8bcaf04c6a5d35b690c10c4 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Thu, 21 Nov 2019 09:20:52 -0600 Subject: [PATCH 2/2] MQE-1774: Review community PR #343 Fixed static checks --- .../FunctionalTestingFramework/Module/MagentoWebDriver.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php index f057cf171..c1ab892d7 100644 --- a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php +++ b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php @@ -839,6 +839,7 @@ public function makeScreenshot($name = null) * * @throws \RuntimeException * @return string + * @SuppressWarnings(PHPMD.UnusedPrivateMethod) */ private function shellExecMagentoCLI($command, $arguments): string {