Fix tests to respond to errno on rejection

implausible · johnhaley81 · commit b49530fc46fb · 2015-10-08T10:49:50.000-07:00
diff --git a/generate/templates/partials/async_function.cc b/generate/templates/partials/async_function.cc
@@ -140,8 +140,10 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
         free((void *)baton->error->message);
       free((void *)baton->error);
     } else if (baton->error_code < 0) {
+      Local<v8::Object> err = Nan::Error("Method {{ jsFunctionName }} has thrown an error.")->ToObject();
+      err->Set(Nan::New("errno").ToLocalChecked(), Nan::New(baton->error_code));
       Local<v8::Value> argv[1] = {
-        Nan::NanErrnoException(baton->error_code, NULL, "A general error has occurred")
+        err
       };
       callback->Call(1, argv);
     } else {
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -686,7 +686,8 @@ describe("Rebase", function() {
       });
   });
 
-  it("can fast-forward via rebase using the convenience methods", function() {
+  it("can fast-forward via rebase using the convenience methods",
+    function() {
     var ourFileName = "ourNewFile.txt";
     var theirFileName = "theirNewFile.txt";
 
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -270,7 +270,9 @@ describe("Remote", function() {
         return Promise.reject(
           new Error("should not be able to push to the repository"));
       }, function(err) {
-        if (err.message === "A general error has occurred") {
+        if (err.errno === NodeGit.Error.CODE.ERROR &&
+          err.message === "Method push has thrown an error.")
+        {
           return Promise.resolve();
         } else {
           throw err;
diff --git a/test/tests/revwalk.js b/test/tests/revwalk.js
@@ -1,6 +1,7 @@
 var assert = require("assert");
 var path = require("path");
 var local = path.join.bind(path, __dirname);
+var Promise = require("nodegit-promise");
 
 describe("Revwalk", function() {
   var NodeGit = require("../../");
@@ -125,7 +126,7 @@ describe("Revwalk", function() {
 
       repository.getMasterCommit().then(function(firstCommitOnMaster) {
         walker.walk(firstCommitOnMaster, function(err, commit) {
-          if (!err && !commit) {
+          if (err && err.errno === NodeGit.Error.CODE.ITEROVER) {
             return done();
           }
 
@@ -152,7 +153,13 @@ describe("Revwalk", function() {
         promise = promise.then(getNext);
       }
     }
-    return promise;
+    return promise.catch(function(error) {
+      if (error && error.errno === NodeGit.Error.CODE.ITEROVER) {
+        return Promise.resolve();
+      } else {
+        throw error;
+      }
+    });
 
     function getNext() {
       return walker.next();
