Skip to content

Feature simple callbackWaitsForEmptyEventLoop support #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeviaVir merged 3 commits into from
May 18, 2017
Merged

Feature simple callbackWaitsForEmptyEventLoop support #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a95be8
Fix to support `callbackWaitsForEmptyEventLoop`
abetomo May 18, 2017
43c995e
Fix test as it supported `callbackWaitsForEmptyEventLoop`
abetomo May 18, 2017
4450858
Remove debugging code
abetomo May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,18 @@ Lambda.prototype._runHandler = function (handler, event, program, context) {

var callback = function (err, result) {
if (err) {
process.exitCode = 255;
console.log('Error: ' + err);
process.exit(255);
} else {
process.exitCode = 0;
console.log('Success:');
if (result) {
console.log(JSON.stringify(result));
}
}
console.log('Success:');
if (!result) {
process.exit(0);
if (context.callbackWaitsForEmptyEventLoop === false) {
process.exit();
}
console.log(JSON.stringify(result));
};

context.getRemainingTimeInMillis = function () {
Expand Down
98 changes: 67 additions & 31 deletions test/node-lambda.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@ const nodeLambdaPath = path.join(__dirname, '..', 'bin', 'node-lambda');
// The reason for specifying the node command in this test is to support Windows.
describe('bin/node-lambda', () => {
describe('node-lambda run', () => {
const _testMain = (expectedValues, done) => {
const run = spawn('node', [nodeLambdaPath, 'run', '--handler', '__test.handler']);
var stdoutString = '';
run.stdout.on('data', (data) => {
stdoutString += data.toString().replace(/\r|\n/g, '');
});

run.on('exit', (code) => {
assert.match(stdoutString, expectedValues.stdoutRegExp);
assert.equal(code, expectedValues.exitCode);
done();
});
};

const _generateHandlerFile = (callbackString) => {
fs.writeFileSync(
'__test.js',
Expand All @@ -32,48 +46,70 @@ describe('bin/node-lambda', () => {
});

it('`node-lambda run` exitCode is `0` (callback(null))', (done) => {
const run = spawn('node', [nodeLambdaPath, 'run']);
var stdoutString = '';
run.stdout.on('data', (data) => {
stdoutString += data.toString().replace(/\r|\n/g, '');
});

run.on('exit', (code) => {
assert.match(stdoutString, /Success:$/);
assert.equal(code, 0);
done();
});
_generateHandlerFile('callback(null);');
_testMain({ stdoutRegExp: /Success:$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `0` (callback(null, "text"))', (done) => {
_generateHandlerFile('callback(null, "text");');

const run = spawn('node', [nodeLambdaPath, 'run', '--handler', '__test.handler']);
var stdoutString = '';
run.stdout.on('data', (data) => {
stdoutString += data.toString().replace(/\r|\n/g, '');
});

run.on('exit', (code) => {
assert.match(stdoutString, /Success:"text"$/);
assert.equal(code, 0);
done();
});
_testMain({ stdoutRegExp: /Success:"text"$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `255` (callback(new Error("e")))', (done) => {
_generateHandlerFile('callback(new Error("e"));');
_testMain({ stdoutRegExp: /Error: Error: e$/, exitCode: 255 }, done);
});

const run = spawn('node', [nodeLambdaPath, 'run', '--handler', '__test.handler']);
var stdoutString = '';
run.stdout.on('data', (data) => {
stdoutString += data.toString().replace(/\r|\n/g, '');
describe('node-lambda run (async)', function () {
this.timeout(5000); // give it time to setTimeout

const _generateHandlerFile = (callbackString, callbackWaitsForEmptyEventLoop) => {
const asyncCodeAndCallbackWaitsForEmptyEventLoopSettig = `
setTimeout(() => console.log('sleep 3500 msec'), 3500);
context.callbackWaitsForEmptyEventLoop = ${callbackWaitsForEmptyEventLoop};
`;
const testJsText = fs
.readFileSync('index.js').toString()
.replace(
/console.log\('Running index.handler'\);/,
asyncCodeAndCallbackWaitsForEmptyEventLoopSettig
)
.replace(/callback\(null\);/, callbackString);
fs.writeFileSync('__test.js', testJsText);
};

describe('callbackWaitsForEmptyEventLoop = true', () => {
it('`node-lambda run` exitCode is `0` (callback(null))', (done) => {
_generateHandlerFile('callback(null);', true);
_testMain({ stdoutRegExp: /Success:sleep 3500 msec$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `0` (callback(null, "text"))', (done) => {
_generateHandlerFile('callback(null, "text");', true);
_testMain({ stdoutRegExp: /Success:"text"sleep 3500 msec$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `255` (callback(new Error("e")))', (done) => {
_generateHandlerFile('callback(new Error("e"));', true);
_testMain({ stdoutRegExp: /Error: Error: esleep 3500 msec$/, exitCode: 255 }, done);
});
});

run.on('exit', (code) => {
assert.match(stdoutString, /Error: Error: e$/);
assert.equal(code, 255);
done();
describe('callbackWaitsForEmptyEventLoop = false', () => {
it('`node-lambda run` exitCode is `0` (callback(null))', (done) => {
_generateHandlerFile('callback(null);', false);
_testMain({ stdoutRegExp: /Success:$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `0` (callback(null, "text"))', (done) => {
_generateHandlerFile('callback(null, "text");', false);
_testMain({ stdoutRegExp: /Success:"text"$/, exitCode: 0 }, done);
});

it('`node-lambda run` exitCode is `255` (callback(new Error("e")))', (done) => {
_generateHandlerFile('callback(new Error("e"));', false);
_testMain({ stdoutRegExp: /Error: Error: e$/, exitCode: 255 }, done);
});
});
});
});
Expand Down