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

Revision: 68417
Author:   daniel
Date:     2010-06-22 17:40:04 +0000 (Tue, 22 Jun 2010)

Log Message:
-----------
meaningful messages when prerequisites are missing

Modified Paths:
--------------
    trunk/extensions/PagedTiffHandler/selenium/PagedTiffHandler_tests.php

Modified: trunk/extensions/PagedTiffHandler/selenium/PagedTiffHandler_tests.php
===================================================================
--- trunk/extensions/PagedTiffHandler/selenium/PagedTiffHandler_tests.php       
2010-06-22 17:39:43 UTC (rev 68416)
+++ trunk/extensions/PagedTiffHandler/selenium/PagedTiffHandler_tests.php       
2010-06-22 17:40:04 UTC (rev 68417)
@@ -19,7 +19,7 @@
 
 class SeleniumCheckPrerequisites extends SeleniumTestCase {
        public $name = 'Check prerequisites';
-       private $allChecksOk = true;
+       private $prerequisiteError = null;
 
        public function runTest() {
                global $wgSeleniumTestsWikiUrl;
@@ -28,22 +28,22 @@
 
                $source = $this->getAttribute( 
"//d...@id='bodyContent']//u...@id" );
                if ( $source != 'filetoc' ) {
-                       $this->allChecksOk = false;
+                       $this->prerequisiteError = 'Image:Multipage.tiff must 
exist.';
                }
 
                // Check for language
                $this->open($wgSeleniumTestsWikiUrl . 
'/api.php?action=query&meta=userinfo&uiprop=options&format=xml');
 
-               $source = $this->getAttribute( "//options/@language" );
-               if ( $source != 'en' ) {
-                       $this->allChecksOk = false;
+               $lang = $this->getAttribute( "//options/@language" );
+               if ( $lang != 'en' ) {
+                       $this->prerequisiteError = 'interface language must be 
set to English (en), but was '.$lang.'.';
                }
        }
 
        public function tearDown() {
-               if ( !$this->allChecksOk ) {
+               if ( $this->prerequisiteError ) {
                        $this->selenium->stop();
-                       die( 'failed' );
+                       die( 'failed: ' . $this->prerequisiteError . "\n" );
                }
        }
 }



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

Reply via email to