Add logging to see where we're locking

implausible · implausible · commit b5c2b282ee8c · 2019-07-22T10:44:44.000-07:00
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -1661,7 +1661,7 @@ describe("Rebase", function() {
 
         return NodeGit.Rebase.init(repository, ourAnnotatedCommit,
           theirAnnotatedCommit, null, {
-            signingCb: (commitContent) => ({
+            signingCb: (commitContent) => (console.log("signingCb called"), {
               code: NodeGit.Error.CODE.OK,
               field: "moose-sig",
               signedData: "A moose was here."
@@ -1674,9 +1674,11 @@ describe("Rebase", function() {
         // there should only be 1 rebase operation to perform
         assert.equal(rebase.operationEntrycount(), 1);
 
+        console.log("running next operation");
         return rebase.next();
       })
       .then(function(rebaseOperation) {
+        console.log("completed next operation");
         assert.equal(rebaseOperation.type(),
           NodeGit.RebaseOperation.REBASE_OPERATION.PICK);
         assert.equal(rebaseOperation.id().toString(),
@@ -1686,9 +1688,11 @@ describe("Rebase", function() {
         // after collecting garbage.
         garbageCollect();
 
+        console.log("running commit operation");
         return rebase.commit(null, ourSignature);
       })
       .then(function(commitOid) {
+        console.log("completed commit operation");
         assert.equal(commitOid.toString(),
           "24250fe6bd8a782ec1aaca8b2c9a2456a90517ed");
 
@@ -1850,7 +1854,7 @@ describe("Rebase", function() {
 
         return NodeGit.Rebase.init(repository, ourAnnotatedCommit,
           theirAnnotatedCommit, null, {
-            signingCb: () => ({
+            signingCb: () => (console.log("signingCb called"), {
               code: NodeGit.Error.CODE.PASSTHROUGH
             })
           });
@@ -1860,10 +1864,12 @@ describe("Rebase", function() {
 
         // there should only be 1 rebase operation to perform
         assert.equal(rebase.operationEntrycount(), 1);
+        console.log("running next operation");
 
         return rebase.next();
       })
       .then(function(rebaseOperation) {
+        console.log("completed next operation");
         assert.equal(rebaseOperation.type(),
           NodeGit.RebaseOperation.REBASE_OPERATION.PICK);
         assert.equal(rebaseOperation.id().toString(),
@@ -1873,9 +1879,12 @@ describe("Rebase", function() {
         // after collecting garbage.
         garbageCollect();
 
+        console.log("running commit operation");
+
         return rebase.commit(null, ourSignature);
       })
       .then(function(commitOid) {
+        console.log("completed commit operation");
         assert.equal(commitOid.toString(),
           "b937100ee0ea17ef20525306763505a7fe2be29e");
 
@@ -2042,7 +2051,7 @@ describe("Rebase", function() {
 
         return NodeGit.Rebase.init(repository, ourAnnotatedCommit,
           theirAnnotatedCommit, null, {
-            signingCb: () => ({
+            signingCb: () => (console.log("signingCb called"), {
               code: NodeGit.Error.CODE.ERROR
             })
           });
@@ -2053,9 +2062,11 @@ describe("Rebase", function() {
         // there should only be 1 rebase operation to perform
         assert.equal(rebase.operationEntrycount(), 1);
 
+        console.log("running next operation");
         return rebase.next();
       })
       .then(function(rebaseOperation) {
+        console.log("completed next operation");
         assert.equal(rebaseOperation.type(),
           NodeGit.RebaseOperation.REBASE_OPERATION.PICK);
         assert.equal(rebaseOperation.id().toString(),
@@ -2065,11 +2076,14 @@ describe("Rebase", function() {
         // after collecting garbage.
         garbageCollect();
 
+        console.log("running commit operation");
         return rebase.commit(null, ourSignature);
       })
       .then(function() {
+        console.log("completed commit operation");
         assert.fail("rebase.commit should have failed");
       }, function(error) {
+        console.log("completed commit operation");
         if (error && error.errno === NodeGit.Error.CODE.ERROR) {
           return;
         }
