martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-02-10 17:39:15 +00:00
Code Issues Projects Releases Wiki Activity

add minimal test for blocking + run project on the first step two prevent parallel run next calls

Browse Source
This commit is contained in:
oleg 2015-06-16 23:51:38 +03:00
parent 27d8e73b26
commit 37ba82eebf
3 changed files with 123 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/distributor.js
View File

@ -55,15 +55,15 @@ Distributor.prototype._runNext = function(callback) {
this.pass(node);
var queueItem = self.queue.splice(queueItemIndex, 1)[0];
var queueItem = self.queue.splice(queueItemIndex, 1)[0],
build = queueItem.build;
self._updateBuild(
queueItem.build,
build,
{startDate: Date.now(), status: 'in-progress', waitReason: ''},
this.slot()
);
},
function(err, node, build) {
var stepCallback = this.slot();
var executor = node.run(build.project, build.params, function(err) {
self._updateBuild(

118
test/distributor/blocking.js Normal file
View File

@ -0,0 +1,118 @@
'use strict';
var Distributor = require('../../lib/distributor').Distributor,
expect = require('expect.js'),
sinon = require('sinon'),
createNodeMock = require('./helpers').createNodeMock,
Steppy = require('twostep').Steppy;
describe('Distributor blocking', function() {
var distributor, updateBuildSpy, projects;
var nodes = [{type: 'local', maxExecutorsCount: 2}];
before(function() {
sinon.stub(Distributor.prototype, '_createNode', createNodeMock(
sinon.stub().callsArgAsync(1)
));
});
describe('should no work when two non-blocking projects run', function() {
before(function() {
projects = [{
name: 'project1',
}, {
name: 'project2'
}];
});
it('distributor should be created without errors', function() {
distributor = new Distributor({projects: projects, nodes: nodes});
updateBuildSpy = sinon.spy(distributor, '_updateBuild');
});
it('should run both projects without errors', function(done) {
Steppy(
function() {
distributor.run({projectName: 'project1'}, this.slot());
distributor.run({projectName: 'project2'}, this.slot());
},
function(err) {
expect(err).not.ok();
this.pass(null);
},
done
);
});
it('both projects should be queued', function() {
var spy = updateBuildSpy;
expect(spy.getCall(0).args[0].project.name).equal('project1');
expect(spy.getCall(0).args[1].status).equal('queued');
expect(spy.getCall(1).args[0].project.name).equal('project2');
expect(spy.getCall(1).args[1].status).equal('queued');
});
it('both projects should be in-progress', function() {
var spy = updateBuildSpy;
expect(spy.getCall(2).args[0].project.name).equal('project1');
expect(spy.getCall(2).args[1].status).equal('in-progress');
expect(spy.getCall(3).args[0].project.name).equal('project2');
expect(spy.getCall(3).args[1].status).equal('in-progress');
});
});
describe('should work project2 blocked by project1', function() {
before(function() {
projects = [{
name: 'project1',
}, {
name: 'project2',
blockedBy: ['project1']
}];
});
it('distributor should be created without errors', function() {
distributor = new Distributor({projects: projects, nodes: nodes});
updateBuildSpy = sinon.spy(distributor, '_updateBuild');
});
it('should run both projects without errors', function(done) {
Steppy(
function() {
distributor.run({projectName: 'project1'}, this.slot());
distributor.run({projectName: 'project2'}, this.slot());
},
function(err) {
expect(err).not.ok();
this.pass(null);
},
done
);
});
it('both projects should be queued', function() {
var spy = updateBuildSpy;
expect(spy.getCall(0).args[0].project.name).equal('project1');
expect(spy.getCall(0).args[1].status).equal('queued');
expect(spy.getCall(1).args[0].project.name).equal('project2');
expect(spy.getCall(1).args[1].status).equal('queued');
});
it('project1 should be in-progress', function() {
var spy = updateBuildSpy;
expect(spy.getCall(2).args[0].project.name).equal('project1');
expect(spy.getCall(2).args[1].status).equal('in-progress');
});
it('project2 should have wait reason (project1)', function() {
var spy = updateBuildSpy;
expect(spy.getCall(3).args[0].project.name).equal('project2');
expect(spy.getCall(3).args[1].waitReason).equal(
'Blocked by currently running "project1"'
);
});
});
});

1
test/distributor/index.js
View File

@ -2,3 +2,4 @@
require('./main.js');
require('./triggerAfter.js');
require('./blocking.js');