github/node-v0.x-archive
1
1
Fork 0
mirror of https://github.com/nodejs/node-v0.x-archive.git synced 2026-04-28 03:01:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

require() should throw error if module does.

Browse Source 
Reported by Kris Zyp
http://groups.google.com/group/nodejs/browse_thread/thread/1feab0309bd5402b
This commit is contained in:
Ryan Dahl
2009-12-18 23:58:04 +01:00
parent 4526308560
commit bfa36136da
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/node.js
View File

@@ -892,7 +892,12 @@ Module.prototype.loadScript = function (filename, loadPromise) {
+ "\n}; __wrap__;";
var compiledWrapper = process.compile(wrapper, filename);
compiledWrapper.apply(self.exports, [self.exports, require, self, filename]);
try {
compiledWrapper.apply(self.exports, [self.exports, require, self, filename]);
} catch (e) {
loadPromise.emitError(e);
return;
}
self.waitChildrenLoad(function () {
self.loaded = true;

1
test/mjsunit/fixtures/throws_error.js Normal file
View File

@@ -0,0 +1 @@
throw new Error("blah");

10
test/mjsunit/test-module-loading.js
View File

@@ -33,6 +33,14 @@ assert.equal("D", d3.D());
assert.equal(true, d4.D instanceof Function);
assert.equal("D", d4.D());
var errorThrown = false;
try {
require("./fixtures/throws_error");
} catch (e) {
errorThrown = true;
assert.equal("blah", e.message);
}
process.addListener("exit", function () {
assert.equal(true, a.A instanceof Function);
assert.equal("A done", a.A());
@@ -49,5 +57,7 @@ process.addListener("exit", function () {
assert.equal(true, d2.D instanceof Function);
assert.equal("D done", d2.D());
assert.equal(true, errorThrown);
puts("exit");
});