diff options
author | Trevor Norris <trev.norris@gmail.com> | 2013-03-26 09:32:41 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-03-27 08:26:17 +0400 |
commit | f0b68892d4e85c078836eb0809c64dde82918aeb (patch) | |
tree | b22e812fda479ac7b6aa303cf0b6bb26dfa948bf /test | |
parent | a80a132b383e9aff2d42bbaebafd4436869eeadb (diff) |
domain: fix domain callback from MakeCallback
Since _tickCallback and _tickDomainCallback were both called from
MakeCallback, it was possible for a callback to be called that required
a domain directly to _tickCallback.
The fix was to implement process.usingDomains(). This will set all
applicable functions to their domain counterparts, and set a flag in cc
to let MakeCallback know domain callbacks always need to be checked.
Added test in own file. It's important that the test remains isolated.
Diffstat (limited to 'test')
-rw-r--r-- | test/simple/test-domain-from-timer.js | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/test/simple/test-domain-from-timer.js b/test/simple/test-domain-from-timer.js new file mode 100644 index 00000000000..3e73a5c4b89 --- /dev/null +++ b/test/simple/test-domain-from-timer.js @@ -0,0 +1,39 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + + +// Simple tests of most basic domain functionality. + +var common = require('../common'); +var assert = require('assert'); + +// timeouts call the callback directly from cc, so need to make sure the +// domain will be used regardless +setTimeout(function() { + var domain = require('domain'); + var d = domain.create(); + d.run(function() { + process.nextTick(function() { + console.trace('in nexttick', process.domain === d) + assert.equal(process.domain, d); + }); + }); +}); |