http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75031

Revision: 75031
Author:   mglaser
Date:     2010-10-19 19:58:58 +0000 (Tue, 19 Oct 2010)

Log Message:
-----------
Follow up r74753, removed pass-by-references and @ operator

Modified Paths:
--------------
    trunk/phase3/maintenance/tests/selenium/SeleniumServerManager.php

Modified: trunk/phase3/maintenance/tests/selenium/SeleniumServerManager.php
===================================================================
--- trunk/phase3/maintenance/tests/selenium/SeleniumServerManager.php   
2010-10-19 19:38:34 UTC (rev 75030)
+++ trunk/phase3/maintenance/tests/selenium/SeleniumServerManager.php   
2010-10-19 19:58:58 UTC (rev 75031)
@@ -179,12 +179,13 @@
                                // on its port. Note: this solution kinda
                                // stinks, since it uses a wait loop - dnessett
 
+                               wfSuppressWarnings();
                                for ( $cnt = 1;
                                      $cnt <= $this->SeleniumServerStartTimeout;
                                      $cnt++ ) {
-                                       $fp = @fsockopen ( 'localhost',
+                                       $fp = fsockopen ( 'localhost',
                                                $this->SeleniumServerPort,
-                                               &$errno, &$errstr, 0 );
+                                               $errno, $errstr, 0 );
                                        if ( !$fp ) {
                                                sleep( 1 );
                                                continue;
@@ -194,6 +195,7 @@
                                                return 'started';
                                        }
                                }
+                               wfRestoreWarnings();
                                echo ( "Starting Selenium server timed out.\n" 
);
                                return 'failed';
                        }



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to