habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log earlier, for formatting sake

Browse Source
This commit is contained in:
Spencer Alger
2015-01-11 16:03:41 -07:00
parent c89f76342a
commit 102d8965d6
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/ci.js
View File

@ -26,6 +26,7 @@ var child_process = require('child_process');
var chalk = require('chalk'); var chalk = require('chalk');
var format = require('util').format; var format = require('util').format;
var NL_RE = /(\r?\n)/g;
var ROOT = join(__dirname, '..'); var ROOT = join(__dirname, '..');
var GRUNT = join(ROOT, './node_modules/.bin/grunt'); var GRUNT = join(ROOT, './node_modules/.bin/grunt');
var ENV = _.clone(process.env); var ENV = _.clone(process.env);
@ -207,8 +208,6 @@ function logImportant(text) {
log('------------'); log('------------');
} }
var RE = /(\r?\n)/g;
function push(m) { function push(m) {
return function () { return function () {
var args = _.toArray(arguments); var args = _.toArray(arguments);
@ -220,7 +219,7 @@ function push(m) {
function indent() { function indent() {
var str = through2( var str = through2(
push(function (chunk) { return String(chunk).replace(RE, '$1 '); }), push(function (chunk) { return String(chunk).replace(NL_RE, '$1 '); }),
push(function () { return '\n'; }) push(function () { return '\n'; })
); );
str.push(' '); str.push(' ');

21
test/integration/yaml_suite/run.js
View File

@ -9,25 +9,20 @@ module.exports = function (branch) {
var es = rootReq('src/elasticsearch'); var es = rootReq('src/elasticsearch');
var clientManager = require('./client_manager'); var clientManager = require('./client_manager');
var port = parseInt(process.env.ES_PORT || 9200, 10);
var _release = branch.match(/^v(\d+\.\d+)\.\d+$/);
var apiVersion = _release ? _release[1] : branch;
console.log(' branch:', branch);
console.log(' port:', port);
console.log(' api version:', apiVersion);
describe('integration', function () { describe('integration', function () {
this.timeout(30000); this.timeout(30000);
// before running any tests... // before running any tests...
before(function (done) { before(function (done) {
this.timeout(5 * 60 * 1000); this.timeout(5 * 60 * 1000);
var apiVersion = branch;
var match;
if (match = apiVersion.match(/^v(\d+\.\d+)\.\d+$/)) {
apiVersion = match[1];
}
var port = parseInt(process.env.ES_PORT || 9200, 10);
console.log('branch:', branch);
console.log('port:', port);
console.log('api version:', apiVersion);
clientManager.create(apiVersion, port, done); clientManager.create(apiVersion, port, done);
}); });