mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Skip auto data dir migration if target dir exists and is non-empty

Browse source
This commit is contained in:
Dan Stillman 2016-11-30 01:50:49 -05:00
parent cba2c0c58b
commit 1b67ed071e
3 changed files with 46 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
test/tests/dataDirectoryTest.js
View file

@ -62,18 +62,17 @@ describe("Zotero.DataDirectory", function () {
var disableCommandMode = function () {
// Force non-mv mode
var origFunc = OS.File.exists;
stubs.fileExists = sinon.stub(OS.File, "exists", function (path) {
if (path == '/bin/mv') {
return Zotero.Promise.resolve(false);
}
else {
return origFunc(path);
}
});
if (!stubs.canMoveDirectoryAtomic) {
stubs.canMoveDirectoryAtomic = sinon.stub(Zotero.File, "canMoveDirectoryAtomic")
.returns(false);
}
};
var resetCommandMode = function () {
stubs.fileExists.restore();
if (stubs.canMoveDirectoryAtomic) {
stubs.canMoveDirectoryAtomic.restore();
stubs.canMoveDirectoryAtomic = undefined;
}
};
var populateDataDirectory = Zotero.Promise.coroutine(function* (dir, srcDir, automatic = false) {
@ -143,7 +142,7 @@ describe("Zotero.DataDirectory", function () {
describe("#checkForMigration()", function () {
let fileMoveStub;
before(function () {
beforeEach(function () {
disableCommandMode();
});
@ -156,6 +155,22 @@ describe("Zotero.DataDirectory", function () {
tests.push([desc, fn]);
}
it("should skip automatic migration if target directory exists and is non-empty", function* () {
resetCommandMode();
// No automatic migration without atomic directory move
if (!Zotero.File.canMoveDirectoryAtomic()) {
this.skip();
}
yield populateDataDirectory(oldDir);
yield OS.File.remove(oldMigrationMarker);
yield OS.File.makeDir(newDir, { unixMode: 0o755 });
yield Zotero.File.putContentsAsync(OS.Path.join(newDir, 'a'), '');
yield assert.eventually.isFalse(Zotero.DataDirectory.checkForMigration(oldDir, newDir));
});
add("should show error on partial failure", function (automatic) {
return function* () {
yield populateDataDirectory(oldDir, null, automatic);