Merge pull request #321 from rexxars/behat-httpd-log

Behat config option for path of internal httpd log location
imbo · Jan 14, 2015 · ac0205a · ac0205a
2 parents a921bc1 + 52b11de
commit ac0205a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/tests/behat/behat.yml b/tests/behat/behat.yml
@@ -13,6 +13,9 @@ default:
       documentRoot: public
       router: %behat.paths.base%/router.php
 
+      # httpd log file location
+      httpdLog: /dev/null
+
       # Timeout when trying to connect to the built in httpd
       timeout: 5
 

diff --git a/tests/behat/bootstrap/RESTContext.php b/tests/behat/bootstrap/RESTContext.php
@@ -123,7 +123,8 @@ public static function setUp(SuiteEvent $event) {
             $url['host'],
             $port,
             $params['documentRoot'],
-            $params['router']
+            $params['router'],
+            $params['httpdLog']
         );
 
         if (!$pid) {
@@ -401,15 +402,17 @@ private static function canConnectToHttpd($host, $port) {
      * @param int $port The port to use
      * @param string $documentRoot The document root
      * @param string $router Path to an optional router
+     * @param string $httpdLog Path the httpd log should be written to
      * @return int Returns the PID of the httpd
      * @throws RuntimeException
      */
-    private static function startBuiltInHttpd($host, $port, $documentRoot, $router = null) {
-        $command = sprintf('php -S %s:%d -t %s %s >/dev/null 2>&1 & echo $!',
+    private static function startBuiltInHttpd($host, $port, $documentRoot, $router, $httpdLog) {
+        $command = sprintf('php -S %s:%d -t %s %s >%s 2>&1 & echo $!',
                             $host,
                             $port,
                             $documentRoot,
-                            $router);
+                            $router,
+                            $httpdLog);
 
         $output = array();
         exec($command, $output);