diff --git a/‎test/tests/commit.js‎
Lines changed: 4 additions & 24 deletions b/‎test/tests/commit.js‎
Lines changed: 4 additions & 24 deletions
diff --git a/‎test/tests/oid.js‎
Lines changed: 10 additions & 0 deletions b/‎test/tests/oid.js‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎test/utils/leak_test.js‎
Lines changed: 33 additions & 0 deletions b/‎test/utils/leak_test.js‎
Lines changed: 33 additions & 0 deletions
@@ -4,6 +4,7 @@ var promisify = require("promisify-node");
 var fse = promisify(require("fs-extra"));
 
 var garbageCollect = require("../utils/garbage_collect.js");
+var leakTest = require("../utils/leak_test");
 
 var local = path.join.bind(path, __dirname);
 
@@ -627,30 +628,9 @@ describe("Commit", function() {
   it("does not leak", function() {
     var test = this;
 
-    garbageCollect();
-    var Commit = NodeGit.Commit;
-    var startSelfFreeingCount = Commit.getSelfFreeingInstanceCount();
-    var startNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount();
-
-    var resolve;
-    var promise = new Promise(function(_resolve) { resolve = _resolve; });
-
-    NodeGit.Commit.lookup(test.repository, oid)
-      .then(function() {
-        // get out of this promise chain to help GC get rid of the commit
-        setTimeout(resolve, 0);
-      });
-
-    return promise
-      .then(function() {
-        garbageCollect();
-        var endSelfFreeingCount = Commit.getSelfFreeingInstanceCount();
-        var endNonSelfFreeingCount = Commit.getNonSelfFreeingConstructedCount();
-        // any new self-freeing commits should have been freed
-        assert.equal(startSelfFreeingCount, endSelfFreeingCount);
-        // no new non-self-freeing commits should have been constructed
-        assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount);
-      });
+    return leakTest(NodeGit.Commit, function() {
+        return NodeGit.Commit.lookup(test.repository, oid);
+    });
   });
 
   it("duplicates signature", function() {
 
@@ -2,6 +2,8 @@ var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
 
+var leakTest = require("../utils/leak_test");
+
 describe("Oid", function() {
   var NodeGit = require("../../");
   var Oid = NodeGit.Oid;
@@ -70,4 +72,12 @@ describe("Oid", function() {
     var oid2 = Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f");
     assert(!this.oid.equal(oid2));
   });
+
+  it("does not leak", function() {
+    return leakTest(Oid, function() {
+      return Promise.resolve(
+        Oid.fromString("13c633665257696a3800b0a39ff636b4593f918f")
+      );
+    });
+  });
 });
@@ -0,0 +1,33 @@
+var assert = require("assert");
+
+var garbageCollect = require("./garbage_collect");
+
+function leakTest(Type, getInstance) {
+  garbageCollect();
+  var startSelfFreeingCount = Type.getSelfFreeingInstanceCount();
+  var startNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount();
+
+  var resolve;
+  var promise = new Promise(function(_resolve) { resolve = _resolve; });
+
+  getInstance()
+    .then(function() {
+      var selfFreeingCount = Type.getSelfFreeingInstanceCount();
+      assert.equal(startSelfFreeingCount + 1, selfFreeingCount);
+      // get out of this promise chain to help GC get rid of the commit
+      setTimeout(resolve, 0);
+    });
+
+  return promise
+    .then(function() {
+      garbageCollect();
+      var endSelfFreeingCount = Type.getSelfFreeingInstanceCount();
+      var endNonSelfFreeingCount = Type.getNonSelfFreeingConstructedCount();
+      // any new self-freeing commits should have been freed
+      assert.equal(startSelfFreeingCount, endSelfFreeingCount);
+      // no new non-self-freeing commits should have been constructed
+      assert.equal(startNonSelfFreeingCount, endNonSelfFreeingCount);
+    });
+}
+
+module.exports = leakTest;