Merge remote-tracking branch 'bulk/async-webapi-2' into async-webapi-2

vrann · vrann · commit f21987da3d86 · 2018-03-29T12:29:41.000-05:00
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Curl.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Curl.php
@@ -27,4 +27,4 @@ public function delete($uri)
     {
         $this->makeRequest("DELETE", $uri);
     }
-}
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
@@ -89,7 +89,6 @@ public function initialize()
             foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
                 exec("kill {$consumerProcessId}");
             }
-
         }
         foreach ($this->consumers as $consumer) {
             if (!$this->getConsumerProcessIds($consumer)) {

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ public function initialize()`
`89`	`89`	`foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {`
`90`	`90`	`exec("kill {$consumerProcessId}");`
`91`	`91`	`}`
`92`		`-`
`93`	`92`	`}`
`94`	`93`	`foreach ($this->consumers as $consumer) {`
`95`	`94`	`if (!$this->getConsumerProcessIds($consumer)) {`