From 2210bf37757bb5551ada4cd7915b6d5ebacde072 Mon Sep 17 00:00:00 2001 From: crbrox Date: Wed, 28 Aug 2013 14:06:56 +0200 Subject: [PATCH 1/2] Set state to error instead of completed --- lib/evPersistence.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/evPersistence.js b/lib/evPersistence.js index 30f88a7..aaa3332 100644 --- a/lib/evPersistence.js +++ b/lib/evPersistence.js @@ -44,7 +44,7 @@ function init(emitter) { } else { type = data.state === MG.STATE_ERROR ? TYPE_ERROR : data.task.headers[MG.HEAD_RELAYER_PERSISTENCE]; respObj = data.result || data.err || {}; - respObj['state'] = 'completed'; + respObj.state = data.state; } doPersistence(data.task, respObj, type, function(error, result) { From 96c38f9fc366ffb74a303f81bbff83ddf5c6fb44 Mon Sep 17 00:00:00 2001 From: XavierVal Date: Wed, 28 Aug 2013 15:11:09 +0200 Subject: [PATCH 2/2] test fix for no completed tasks -> error --- test/e2e/persistenceCallbackTest.js | 5 +++-- test/e2e/persistenceTest.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/e2e/persistenceCallbackTest.js b/test/e2e/persistenceCallbackTest.js index fe79c91..701a84c 100644 --- a/test/e2e/persistenceCallbackTest.js +++ b/test/e2e/persistenceCallbackTest.js @@ -262,7 +262,7 @@ describe('Feature: Persistence Callback #FPT #FCB', function() { ' first callback is incorrect', function() { it('CallBack Incorrect', function(done) { - + this.timeout(3000) var id, type = 'POST', httpCallBack = 'http://noexiste:2222'; var simpleServer = server.serverListener( @@ -277,6 +277,7 @@ describe('Feature: Persistence Callback #FPT #FCB', function() { utils.makeRequest(options, content, function(e, data) { id = JSON.parse(data).id; + // console.log(id); }); }, @@ -314,7 +315,7 @@ describe('Feature: Persistence Callback #FPT #FCB', function() { utils.makeRequest(options, '', checkResponse); - }, 10); + }, 30); } ); diff --git a/test/e2e/persistenceTest.js b/test/e2e/persistenceTest.js index 981b476..25e356b 100644 --- a/test/e2e/persistenceTest.js +++ b/test/e2e/persistenceTest.js @@ -157,7 +157,7 @@ describe('Feature: Persistence #FPT', function() { options.headers = {}; options.method = 'POST'; options.headers['X-Relayer-Host'] = 'notAServer:8014'; - options.headers['X-relayer-persistence'] = 'BODY'; + options.headers['X-relayer-persistence'] = 'HEADER'; options.headers['test-header'] = 'test header'; async.series([ @@ -186,7 +186,7 @@ describe('Feature: Persistence #FPT', function() { var JSONres = JSON.parse(data); - if (!checked && res.statusCode !== 404 && JSONres.state === 'completed') { + if (!checked && res.statusCode !== 400 && JSONres.state === 'error') { clearInterval(interval); @@ -202,7 +202,7 @@ describe('Feature: Persistence #FPT', function() { utils.makeRequest(options, '', checkResponse); - }, 10); + }, 20); } ], function(err, res) { var resGet = res[1];