LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expanded test for wide dirs, fix, switch to async.eachSeries everywhere

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-07-21 15:08:39 -04:00
parent 064e986d26
commit e063edc6fc
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/providers/memory.js
View File

@ -1,5 +1,7 @@
var FILE_SYSTEM_NAME = require('../constants.js').FILE_SYSTEM_NAME; var FILE_SYSTEM_NAME = require('../constants.js').FILE_SYSTEM_NAME;
var asyncCallback = require('../../lib/async.js').nextTick; // NOTE: prefer setImmediate to nextTick for proper recursion yielding.
// see https://github.com/js-platform/filer/pull/24
var asyncCallback = require('../../lib/async.js').setImmediate;
/** /**
* Make shared in-memory DBs possible when using the same name. * Make shared in-memory DBs possible when using the same name.

4
src/shell/shell.js
View File

@ -255,7 +255,7 @@ Shell.prototype.ls = function(dir, options, callback) {
}); });
} }
async.each(entries, getDirEntry, function(error) { async.eachSeries(entries, getDirEntry, function(error) {
callback(error, result); callback(error, result);
}); });
}); });
@ -323,7 +323,7 @@ Shell.prototype.rm = function(path, options, callback) {
// Root dir entries absolutely // Root dir entries absolutely
return Path.join(pathname, filename); return Path.join(pathname, filename);
}); });
async.each(entries, remove, function(error) { async.eachSeries(entries, remove, function(error) {
if(error) { if(error) {
callback(error); callback(error);
return; return;

39
tests/bugs/ls-depth-bug.js
View File

@ -1,6 +1,7 @@
var Filer = require('../..'); var Filer = require('../..');
var util = require('../lib/test-utils.js'); var util = require('../lib/test-utils.js');
var expect = require('chai').expect; var expect = require('chai').expect;
var async = require('../../lib/async.js');
describe('sh.ls and deep directory trees', function() { describe('sh.ls and deep directory trees', function() {
beforeEach(util.setup); beforeEach(util.setup);
@ -10,10 +11,10 @@ describe('sh.ls and deep directory trees', function() {
var fs = util.fs(); var fs = util.fs();
var sh = fs.Shell(); var sh = fs.Shell();
// The specific depth at which this will fail is based on the depth var path = '';
// of the call stack, since sh.ls() is recursive, so it can be less for(var i=0; i<50; i++) {
// than this in some cases, but this should trigger it in *this* case. path += '/' + i;
var path = '/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20'; }
sh.mkdirp(path, function(err) { sh.mkdirp(path, function(err) {
if(err) throw err; if(err) throw err;
@ -25,4 +26,34 @@ describe('sh.ls and deep directory trees', function() {
}); });
}); });
}); });
it('should not crash when calling sh.ls() on wide directory layouts', function(done) {
var fs = util.fs();
var sh = fs.Shell();
var dirName = '/dir';
fs.mkdir(dirName, function(err) {
if(err) throw err;
var paths = [];
for(var i=0; i<100; i++) {
paths.push(Filer.Path.join(dirName, ''+i));
}
function writeFile(path, callback) {
fs.writeFile(path, 'data', callback);
}
async.eachSeries(paths, writeFile, function(err) {
if(err) { console.log('error', err); throw err; }
sh.ls('/', {recursive: true}, function(err, listing) {
expect(err).not.to.exist;
expect(listing).to.exist;
done();
});
});
});
});
}); });