More reliable worker thread test

ianhattendorf · ianhattendorf · commit f82e10ccbc3c · 2020-09-10T13:32:24.000-07:00
diff --git a/test/tests/clone.js b/test/tests/clone.js
@@ -1,4 +1,3 @@
-var { Worker } = require("worker_threads");
 var path = require("path");
 var assert = require("assert");
 var fse = require("fs-extra");
@@ -55,52 +54,6 @@ describe("Clone", function() {
     });
   });
 
-  it("can clone with https via worker thread", function(done) {
-    const workerPath = path.join(__dirname, "../utils/clone_worker.js");
-    const worker = new Worker(workerPath, {
-      workerData: {
-        clonePath,
-        url: "https://github.com/nodegit/test.git"
-      }
-    });
-    worker.on("message", (success) => {
-      if (success) {
-        done();
-      } else {
-        assert.fail();
-      }
-    });
-    worker.on("error", () => assert.fail());
-    worker.on("exit", (code) => {
-      if (code !== 0) {
-        assert.fail();
-      }
-    });
-  });
-
-  for (let i = 0; i < 5; ++i) {
-    it(`can kill worker thread while cloning #${i}`, function(done) { // jshint ignore:line
-      const workerPath = path.join(__dirname, "../utils/clone_worker.js");
-      const worker = new Worker(workerPath, { 
-        workerData: {
-          clonePath,
-          url: "https://github.com/nodegit/test.git"
-        }
-      });
-      worker.on("error", () => assert.fail());
-      worker.on("message", () => assert.fail());
-      worker.on("exit", (code) => {
-        if (code === 1) {
-          done();
-        } else {
-          assert.fail();
-        }
-      });
-
-      setTimeout(() => { worker.terminate(); }, 500);
-    });
-  }
-
   it("can clone twice with https using same config object", function() {
     var test = this;
     var url = "https://github.com/nodegit/test.git";
diff --git a/test/tests/worker.js b/test/tests/worker.js
@@ -0,0 +1,81 @@
+const { Worker } = require("worker_threads");
+const path = require("path");
+const assert = require("assert");
+const fse = require("fs-extra");
+const local = path.join.bind(path, __dirname);
+
+describe("Worker", function() {
+  const clonePath = local("../repos/clone");
+
+  // Set a reasonable timeout here now that our repository has grown.
+  this.timeout(30000);
+
+  beforeEach(function() {
+    return fse.remove(clonePath).catch(function(err) {
+      console.log(err);
+
+      throw err;
+    });
+  });
+
+  it("can perform basic functionality via worker thread", function(done) {
+    const workerPath = local("../utils/worker.js");
+    const worker = new Worker(workerPath, {
+      workerData: {
+        clonePath,
+        url: "https://github.com/nodegit/test.git"
+      }
+    });
+    worker.on("message", (message) => {
+      switch (message) {
+        case "init":
+          break;
+        case "success":
+          done();
+          break;
+        case "failure":
+          assert.fail();
+          break;
+      }
+    });
+    worker.on("error", () => assert.fail());
+    worker.on("exit", (code) => {
+      if (code !== 0) {
+        assert.fail();
+      }
+    });
+  });
+
+  for (let i = 0; i < 5; ++i) {
+    it(`can kill worker thread while in use #${i}`, function(done) { // jshint ignore:line
+      const workerPath = local("../utils/worker.js");
+      const worker = new Worker(workerPath, { 
+        workerData: {
+          clonePath,
+          url: "https://github.com/nodegit/test.git"
+        }
+      });
+      worker.on("message", (message) => {
+        switch (message) {
+          case "init":
+            setTimeout(() => { worker.terminate(); }, 500);
+            break;
+          case "success":
+            assert.fail();
+            break;
+          case "failure":
+            assert.fail();
+            break;
+        }
+      });
+      worker.on("error", () => assert.fail());
+      worker.on("exit", (code) => {
+        if (code === 1) {
+          done();
+        } else {
+          assert.fail();
+        }
+      });
+    });
+  }
+});
diff --git a/test/utils/clone_worker.js b/test/utils/clone_worker.js
diff --git a/test/utils/worker.js b/test/utils/worker.js
@@ -0,0 +1,38 @@
+const {
+  isMainThread,
+  parentPort,
+  workerData
+} = require("worker_threads");
+const assert = require("assert");
+const NodeGit = require("../../");
+
+if (isMainThread) {
+  throw new Error("Must be run via worker thread");
+}
+
+parentPort.postMessage("init");
+
+const { clonePath, url } = workerData;
+const opts = {
+    fetchOpts: {
+      callbacks: {
+        certificateCheck: () => 0
+    }
+  }
+};
+
+let repository;
+return NodeGit.Clone(url, clonePath, opts).then((_repository) => {
+  repository = _repository;
+  assert.ok(repository instanceof NodeGit.Repository);
+  return repository.index();
+}).then((index) => {
+  assert.ok(index instanceof NodeGit.Index);
+  return repository.getRemoteNames();
+}).then((remotes) => {
+  assert.ok(Array.isArray(remotes));
+  return repository.getCurrentBranch();
+}).then((branch) => {
+  assert.ok(branch instanceof NodeGit.Reference);
+  parentPort.postMessage("success");
+}).catch(() => parentPort.postMessage("failure"));
