http://www.mediawiki.org/wiki/Special:Code/MediaWiki/91211
Revision: 91211
Author: demon
Date: 2011-06-30 19:47:26 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
Remove --upload option to parserTests.php and backend RemoteTestRecorder -- was
only used for since-removed CR integration
Modified Paths:
--------------
trunk/phase3/includes/AutoLoader.php
trunk/phase3/tests/parser/parserTest.inc
trunk/phase3/tests/parserTests.php
trunk/phase3/tests/testHelpers.inc
Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php 2011-06-30 19:45:08 UTC (rev
91210)
+++ trunk/phase3/includes/AutoLoader.php 2011-06-30 19:47:26 UTC (rev
91211)
@@ -846,7 +846,6 @@
'DbTestPreviewer' => 'tests/testHelpers.inc',
'DbTestRecorder' => 'tests/testHelpers.inc',
'DummyTermColorer' => 'tests/testHelpers.inc',
- 'RemoteTestRecorder' => 'tests/testHelpers.inc',
'TestFileIterator' => 'tests/testHelpers.inc',
'TestRecorder' => 'tests/testHelpers.inc',
Modified: trunk/phase3/tests/parser/parserTest.inc
===================================================================
--- trunk/phase3/tests/parser/parserTest.inc 2011-06-30 19:45:08 UTC (rev
91210)
+++ trunk/phase3/tests/parser/parserTest.inc 2011-06-30 19:47:26 UTC (rev
91211)
@@ -185,8 +185,6 @@
$options['setversion'] :
SpecialVersion::getVersion();
} elseif ( isset( $options['compare'] ) ) {
$this->recorder = new DbTestPreviewer( $this );
- } elseif ( isset( $options['upload'] ) ) {
- $this->recorder = new RemoteTestRecorder( $this );
} else {
$this->recorder = new TestRecorder( $this );
}
Modified: trunk/phase3/tests/parserTests.php
===================================================================
--- trunk/phase3/tests/parserTests.php 2011-06-30 19:45:08 UTC (rev 91210)
+++ trunk/phase3/tests/parserTests.php 2011-06-30 19:47:26 UTC (rev 91211)
@@ -51,7 +51,6 @@
--seed <n> Start the fuzz test from the specified seed
--help Show this help message
--run-disabled run disabled tests
- --upload Upload test results to remote wiki (per
\$wgParserTestRemote)
ENDS;
exit( 0 );
Modified: trunk/phase3/tests/testHelpers.inc
===================================================================
--- trunk/phase3/tests/testHelpers.inc 2011-06-30 19:45:08 UTC (rev 91210)
+++ trunk/phase3/tests/testHelpers.inc 2011-06-30 19:47:26 UTC (rev 91211)
@@ -349,99 +349,6 @@
}
}
-class RemoteTestRecorder extends TestRecorder {
- function start() {
- parent::start();
-
- $this->results = array();
- $this->ping( 'running' );
- }
-
- function record( $test, $result ) {
- parent::record( $test, $result );
- $this->results[$test] = (bool)$result;
- }
-
- function end() {
- $this->ping( 'complete', $this->results );
- parent::end();
- }
-
- /**
- * Inform a CodeReview instance that we've started or completed a test
run...
- *
- * @param $status string: "running" - tell it we've started
- * "complete" - provide test results array
- * "abort" - something went horribly awry
- * @param $results array of test name => true/false
- */
- function ping( $status, $results = false ) {
- global $wgParserTestRemote, $IP;
-
- $remote = $wgParserTestRemote;
- $revId = SpecialVersion::getSvnRevision( $IP );
- $jsonResults = FormatJson::encode( $results );
-
- if ( !$remote ) {
- print "Can't do remote upload without configuring
\$wgParserTestRemote!\n";
- exit( 1 );
- }
-
- // Generate a hash MAC to validate our credentials
- $message = array(
- $remote['repo'],
- $remote['suite'],
- $revId,
- $status,
- );
-
- if ( $status == "complete" ) {
- $message[] = $jsonResults;
- }
- $hmac = hash_hmac( "sha1", implode( "|", $message ),
$remote['secret'] );
-
- $postData = array(
- 'action' => 'codetestupload',
- 'format' => 'json',
- 'repo' => $remote['repo'],
- 'suite' => $remote['suite'],
- 'rev' => $revId,
- 'status' => $status,
- 'hmac' => $hmac,
- );
-
- if ( $status == "complete" ) {
- $postData['results'] = $jsonResults;
- }
-
- $response = $this->post( $remote['api-url'], $postData );
-
- if ( $response === false ) {
- print "CodeReview info upload failed to reach
server.\n";
- exit( 1 );
- }
-
- $responseData = FormatJson::decode( $response, true );
-
- if ( !is_array( $responseData ) ) {
- print "CodeReview API response not recognized...\n";
- wfDebug( "Unrecognized CodeReview API response:
$response\n" );
- exit( 1 );
- }
-
- if ( isset( $responseData['error'] ) ) {
- $code = $responseData['error']['code'];
- $info = $responseData['error']['info'];
- print "CodeReview info upload failed: $code $info\n";
- exit( 1 );
- }
- }
-
- function post( $url, $data ) {
- return Http::post( $url, array( 'postData' => $data ) );
- }
-}
-
class TestFileIterator implements Iterator {
private $file;
private $fh;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
