Skip to content

Commit

Permalink
Fix protocol fs test
Browse files Browse the repository at this point in the history
  • Loading branch information
code-asher committed Apr 24, 2019
1 parent c9f91e7 commit 0de7247
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 11 deletions.
21 changes: 12 additions & 9 deletions packages/protocol/test/fs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ describe("fs", () => {
describe("chown", () => {
it("should chown existing file", async () => {
const file = await helper.createTmpFile();
await expect(util.promisify(fs.chown)(file, 1, 1))
await expect(util.promisify(nativeFs.chown)(file, 1000, 1000))
.resolves.toBeUndefined();
});

it("should fail to chown nonexistent file", async () => {
await expect(util.promisify(fs.chown)(helper.tmpFile(), 1, 1))
await expect(util.promisify(fs.chown)(helper.tmpFile(), 1000, 1000))
.rejects.toThrow("ENOENT");
});
});
Expand Down Expand Up @@ -198,13 +198,13 @@ describe("fs", () => {
it("should fchown existing file", async () => {
const file = await helper.createTmpFile();
const fd = await util.promisify(nativeFs.open)(file, "r");
await expect(util.promisify(fs.fchown)(fd, 1, 1))
await expect(util.promisify(fs.fchown)(fd, 1000, 1000))
.resolves.toBeUndefined();
await util.promisify(nativeFs.close)(fd);
});

it("should fail to fchown nonexistent file", async () => {
await expect(util.promisify(fs.fchown)(99999, 1, 1))
await expect(util.promisify(fs.fchown)(99999, 1000, 1000))
.rejects.toThrow("EBADF");
});
});
Expand Down Expand Up @@ -275,7 +275,7 @@ describe("fs", () => {
it("should futimes existing file", async () => {
const file = await helper.createTmpFile();
const fd = await util.promisify(nativeFs.open)(file, "w");
await expect(util.promisify(fs.futimes)(fd, 1, 1))
await expect(util.promisify(fs.futimes)(fd, 1000, 1000))
.resolves.toBeUndefined();
await util.promisify(nativeFs.close)(fd);
});
Expand Down Expand Up @@ -311,12 +311,12 @@ describe("fs", () => {
describe("lchown", () => {
it("should lchown existing file", async () => {
const file = await helper.createTmpFile();
await expect(util.promisify(fs.lchown)(file, 1, 1))
await expect(util.promisify(fs.lchown)(file, 1000, 1000))
.resolves.toBeUndefined();
});

it("should fail to lchown nonexistent file", async () => {
await expect(util.promisify(fs.lchown)(helper.tmpFile(), 1, 1))
await expect(util.promisify(fs.lchown)(helper.tmpFile(), 1000, 1000))
.rejects.toThrow("ENOENT");
});
});
Expand Down Expand Up @@ -621,7 +621,10 @@ describe("fs", () => {
});
});

it("should dispose", () => {
client.dispose();
it("should dispose", (done) => {
setTimeout(() => {
client.dispose();
done();
}, 100);
});
});
3 changes: 2 additions & 1 deletion packages/protocol/test/spdlog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ describe("spdlog", () => {
.toContain("critical");
});

it("should dispose", () => {
it("should dispose", (done) => {
setTimeout(() => {
client.dispose();
done();
}, 100);
});
});
5 changes: 4 additions & 1 deletion packages/protocol/test/trash.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import * as util from "util";
import { Module } from "../src/common/proxy";
import { createClient, Helper } from "./helpers";

// tslint:disable deprecation to use fs.exists

describe("trash", () => {
const client = createClient();
const trash = client.modules[Module.Trash];
Expand All @@ -18,9 +20,10 @@ describe("trash", () => {
expect(await util.promisify(fs.exists)(file)).toBeFalsy();
});

it("should dispose", () => {
it("should dispose", (done) => {
setTimeout(() => {
client.dispose();
done();
}, 100);
});
});
12 changes: 12 additions & 0 deletions scripts/test-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,15 @@ Object.defineProperty(fs.read, util.promisify.custom, {
global.requestAnimationFrame = (cb) => {
setTimeout(cb, 0);
};

// lchmod might not be available. Jest runs graceful-fs which makes this a no-op
// when it doesn't exist but that doesn't seem to always run when running
// multiple tests (or maybe it gets undone after a test).
if (!fs.lchmod) {
fs.lchmod = function (path, mode, cb) {
if (cb) {
process.nextTick(cb);
}
};
fs.lchmodSync = function () {};
}

0 comments on commit 0de7247

Please sign in to comment.