var wgServer = process.env.MW_SERVER,
wgScriptPath = process.env.MW_SCRIPT_PATH,
- WebdriverIOconfigFile,
karmaProxy = {};
grunt.loadNpmTasks( 'grunt-banana-checker' );
changeOrigin: true
};
- if ( process.env.JENKINS_HOME ) {
- WebdriverIOconfigFile = './tests/selenium/wdio.conf.jenkins.js';
- } else {
- WebdriverIOconfigFile = './tests/selenium/wdio.conf.js';
- }
-
grunt.initConfig( {
eslint: {
all: [
// Configure WebdriverIO task
webdriver: {
test: {
- configFile: WebdriverIOconfigFile
+ configFile: './tests/selenium/wdio.conf.js'
}
}
'name' => $this->nameField
],
[],
- __METHOD__
+ __METHOD__,
+ [ 'ORDER BY' => 'id' ]
);
$assocArray = [];
} else {
# Nothing prior was there to lose from the transaction,
# so just roll it back.
- $this->doRollback( __METHOD__ . " ($fname)" );
- $this->trxStatus = self::STATUS_TRX_OK;
+ $this->rollback( __METHOD__ . " ($fname)", self::FLUSHING_INTERNAL );
}
$this->trxStatusIgnoredCause = null;
} else {
* @private
*/
protected function mainLoginForm( array $requests, $msg = '', $msgtype = 'error' ) {
- $titleObj = $this->getPageTitle();
$user = $this->getUser();
$out = $this->getOutput();
"qunit": "grunt qunit",
"doc": "jsduck",
"postdoc": "grunt copy:jsduck",
- "selenium": "killall -0 chromedriver 2>/dev/null || chromedriver --url-base=/wd/hub --port=4444 & grunt webdriver:test; killall chromedriver"
+ "selenium": "./tests/selenium/selenium.sh"
},
"devDependencies": {
"bluebird": "3.5.1",
$store->getMap();
$table = $store->getMap();
- $expected = [ 2 => 'bar', 1 => 'foo' ];
+ $expected = [ 1 => 'foo', 2 => 'bar' ];
$this->assertSame( $expected, $table );
// Make sure the table returned is the same as the cached table
$this->assertSame( $expected, TestingAccessWrapper::newFromObject( $store )->tableCache );
$lb = new LoadBalancer( [
'servers' => $servers,
+ 'queryLogger' => MediaWiki\Logger\LoggerFactory::getInstance( 'DBQuery' ),
'localDomain' => new DatabaseDomain( $wgDBname, null, $this->dbPrefix() )
] );
$lb = new LoadBalancer( [
'servers' => $servers,
'localDomain' => new DatabaseDomain( $wgDBname, null, $this->dbPrefix() ),
+ 'queryLogger' => MediaWiki\Logger\LoggerFactory::getInstance( 'DBQuery' ),
'loadMonitorClass' => LoadMonitorNull::class
] );
// re-throw original error, to preserve stack trace
throw $ex;
}
- } finally {
- $db->rollback( __METHOD__, 'flush' );
}
}
$table = $db->tableName( 'some_table' );
try {
$db->dropTable( 'some_table' ); // clear for sanity
+
+ // Trigger DBO_TRX to create a transaction so the flush below will
+ // roll everything here back in sqlite. But don't actually do the
+ // code below inside an atomic section becaue MySQL and Oracle
+ // auto-commit transactions for DDL statements like CREATE TABLE.
+ $db->startAtomic( __METHOD__ );
+ $db->endAtomic( __METHOD__ );
+
// Use only basic SQL and trivial types for these queries for compatibility
$this->assertNotSame(
false,
$db->query( "DELETE FROM $table WHERE id=57634126", __METHOD__ ),
"delete query"
);
- $this->assertNotSame(
- false,
- $db->query( "DROP TABLE $table", __METHOD__ ),
- "table dropped"
- );
} finally {
+ // Drop the table to clean up, ignoring any error.
+ $db->query( "DROP TABLE $table", __METHOD__, true );
+ // Rollback the DBO_TRX transaction for sqlite's benefit.
$db->rollback( __METHOD__, 'flush' );
}
}
--- /dev/null
+#!/usr/bin/env bash
+set -euo pipefail
+chromedriver --url-base=/wd/hub --port=4444 &
+# Make sure it is killed to prevent file descriptors leak
+function kill_chromedriver() {
+ killall chromedriver > /dev/null
+}
+trap kill_chromedriver EXIT
+./node_modules/.bin/grunt webdriver:test
+++ /dev/null
-'use strict';
-const merge = require( 'deepmerge' ),
- password = 'testpass',
- username = 'WikiAdmin',
- wdioConf = require( './wdio.conf.js' );
-
-// Overwrite default settings
-exports.config = merge( wdioConf.config, {
- username: process.env.MEDIAWIKI_USER === undefined ?
- username :
- process.env.MEDIAWIKI_USER,
- password: process.env.MEDIAWIKI_PASSWORD === undefined ?
- password :
- process.env.MEDIAWIKI_PASSWORD,
- screenshotPath: '../log/',
- baseUrl: process.env.MW_SERVER + process.env.MW_SCRIPT_PATH,
- exclude: [
- './extensions/CirrusSearch/tests/selenium/specs/**/*.js'
- ],
- reporters: [ 'spec', 'junit' ],
- reporterOptions: {
- junit: {
- outputDir: '../log/'
- }
- }
-} );
'use strict';
-const password = 'vagrant',
- fs = require( 'fs' ),
- path = require( 'path' ),
+const fs = require( 'fs' ),
+ path = require( 'path' );
+
+let logPath, password, username;
+
+// username and password will be used only if
+// MEDIAWIKI_USER or MEDIAWIKI_PASSWORD environment variables are not set
+if ( process.env.JENKINS_HOME ) {
+ logPath = '../log/';
+ password = 'testpass';
+ username = 'WikiAdmin';
+} else {
+ logPath = './log/';
+ password = 'vagrant';
username = 'Admin';
+}
function relPath( foo ) {
return path.resolve( __dirname, '../..', foo );
],
// Patterns to exclude.
exclude: [
- // 'path/to/excluded/files'
+ './extensions/CirrusSearch/tests/selenium/specs/**/*.js'
],
//
// ============
bail: 0,
//
// Saves a screenshot to a given path if a command fails.
- screenshotPath: './log/',
+ screenshotPath: logPath,
//
// Set a base URL in order to shorten url command calls. If your `url` parameter starts
// with `/`, the base url gets prepended, not including the path portion of your baseUrl.
// Test reporter for stdout.
// The only one supported by default is 'dot'
// see also: http://webdriver.io/guide/testrunner/reporters.html
- reporters: [ 'spec' ],
+ reporters: [ 'spec', 'junit' ],
+ reporterOptions: {
+ junit: {
+ outputDir: logPath
+ }
+ },
//
// Options to be passed to Mocha.
// See the full list at http://mochajs.org/
dépôts / lhc / web / wiklou.git / commitdiff