github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix pathwatcher fallback tests

Browse Source 
- Future.wait does not throw
- any non-empty env var counts as true
This commit is contained in:
David Glasser
2014-12-16 17:04:53 -08:00
parent b7c4ca6ac1
commit 64645d8727
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tools/tests/old.js
View File

@@ -27,7 +27,7 @@ var runOldTest = function (filename, extraEnv) {
METEOR_TOOL_PATH: s.execPath
}, extraEnv))
});
run.waitSecs(1000);
run.waitSecs(40);
run.expectExit(0);
};
@@ -47,16 +47,19 @@ var runOldTest = function (filename, extraEnv) {
//
selftest.define("watch", ["slow"], function () {
var runFuture = runOldTest.future();
Future.wait(
runFuture('test-watch.js', {
METEOR_WATCH_FORCE_POLLING: 0
}),
var futures = [
// Run with pathwatcher (if possible)
runFuture('test-watch.js'),
// Run with fs.watchFile fallback
runFuture('test-watch.js', {
METEOR_WATCH_FORCE_POLLING: 1
})
);
];
Future.wait(futures);
// Throw if any threw.
_.each(futures, function (f) {
f.get();
});
});
selftest.define("bundler-assets", ["checkout"], function () {