diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-01-22 08:42:05 -0800 |
| commit | fdc3cc9d7a2d1e12c74fc0c0939d22f40e58b52b (patch) | |
| tree | 0e73ef7de9054f7d9b2fe90a5aec9ad072716865 /deps/npm/test/tap/outdated-json.js | |
| parent | 6514a4128c3e7aa6c1bb1c6f3f018412fa76e5d9 (diff) | |
| parent | 25f9e92813eda927c3d3eaa56dab3a397afadebe (diff) | |
| download | node-merge-test.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'merge-test
Conflicts:
node.gyp
Diffstat (limited to 'deps/npm/test/tap/outdated-json.js')
| -rw-r--r-- | deps/npm/test/tap/outdated-json.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/deps/npm/test/tap/outdated-json.js b/deps/npm/test/tap/outdated-json.js index f54642fab..7c19561ee 100644 --- a/deps/npm/test/tap/outdated-json.js +++ b/deps/npm/test/tap/outdated-json.js @@ -4,10 +4,11 @@ var common = require("../common-tap.js") , npm = require("../../") , mr = require("npm-registry-mock") , path = require("path") + , osenv = require("osenv") , spawn = require('child_process').spawn , node = process.execPath , npmc = require.resolve('../../') - , pkg = __dirname + '/outdated-new-versions' + , pkg = path.resolve(__dirname, 'outdated-new-versions') , args = [ npmc , 'outdated' , '--json' @@ -65,6 +66,8 @@ test("cleanup", function (t) { }) function cleanup () { + // windows fix for locked files + process.chdir(osenv.tmpdir()) rimraf.sync(pkg + "/node_modules") rimraf.sync(pkg + "/cache") } |