Revernting last changes:

- Short option in mocha
  - Using batch event emmit to check job status in test
This commit is contained in:
Daniel García Aubert 2016-01-26 11:43:30 +01:00
parent aed83ed6b0
commit 458d762f9f
2 changed files with 21 additions and 8 deletions

View File

@ -26,7 +26,7 @@ var metadataBackend = require('cartodb-redis')({
});
var batchFactory = require('../../batch');
describe('Use case 1: cancel and modify a done job', function () {
describe.skip('Use case 1: cancel and modify a done job', function () {
var batch = batchFactory(metadataBackend);
@ -58,11 +58,24 @@ describe('Use case 1: cancel and modify a done job', function () {
});
it('Step 2, job should be done', function (done) {
batch.on('job:done', function (job_id) {
if (job_id === doneJob.job_id) {
done();
}
});
var interval = setInterval(function () {
assert.response(app, {
url: '/api/v2/sql/job/' + doneJob.job_id + '?api_key=1234',
headers: { 'host': 'vizzuality.cartodb.com', 'Content-Type': 'application/x-www-form-urlencoded' },
method: 'GET'
}, {
status: 200
}, function (res) {
var job = JSON.parse(res.body);
if (job.status === "done") {
clearInterval(interval);
done();
} else if (job.status === "failed" || job.status === "cancelled") {
clearInterval(interval);
done(new Error('Job ' + job.job_id + ' is ' + job.status + ', expected to be done'));
}
});
}, 50);
});
it('Step 3, cancel a done job should give an error', function (done){

View File

@ -135,10 +135,10 @@ echo
if test x"$OPT_COVERAGE" = xyes; then
echo "Running tests with coverage"
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u tdd -t 5000 -s ${TESTS}
./node_modules/.bin/istanbul cover node_modules/.bin/_mocha -- -u tdd -t 5000 ${TESTS}
else
echo "Running tests"
mocha -u tdd -t 5000 -s ${TESTS}
mocha -u tdd -t 5000 ${TESTS}
fi
ret=$?