Fixed remote test error in linux / osx

implausible · implausible · commit 4a9cfa9caa8b · 2015-07-29T09:58:59.000-07:00
OSX/Linux now implement the proper behavior of libgit2 for the credentials call back. When connecting to the remote, if the credentials are bad, the remote_connect will try the credentials cb again until the credentials cb returns an unusable credentials object or the server accepts the credentials.

As such, we need to put a counter on the credentials for hardcoded values, and then return nothing in the cred call back and expect to catch an error thrown by libgit.
diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -191,19 +191,27 @@ describe("Remote", function() {
       .then(function(remote) {
         var ref = "refs/heads/" + branch;
         var refs = [ref + ":" + ref];
+        var firstPass = true;
         var options = {
           callbacks: {
-            credentials: function(url, userName) {
-              if (url.indexOf("https") === -1) {
-                return NodeGit.Cred.sshKeyFromAgent(userName);
-              } else {
-                return NodeGit.Cred.userpassPlaintextNew(userName, "");
+            credentials:function(url, userName) {
+              if (firstPass) {
+                if (url.indexOf("https") === -1) {
+                  return NodeGit.Cred.sshKeyFromAgent(userName);
+                } else {
+                    return NodeGit.Cred.defaultNew();
+                }
               }
+            },
+            certificateCheck: function() {
+              return 1;
             }
           }
         };
         return remote.push(refs, options);
       })
+      // takes care of windows bug, see the .catch for the proper pathway
+      // that this flow should take (cred cb doesn't run twice -> throws error)
       .then(function() {
         return Promise.reject(
           new Error("should not be able to push to the repository"));
@@ -213,6 +221,17 @@ describe("Remote", function() {
         } else {
           return Promise.resolve();
         }
+      })
+      // catches linux / osx failure to use anonymous credentials
+      // stops callback infinite loop
+      .catch(function (reason) {
+        if (reason.message !==
+          "credentials callback returned an invalid cred type")
+        {
+          throw reason;
+        } else {
+          return Promise.resolve();
+        }
       });
   });
 });
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -253,34 +253,23 @@
         "libgit2/src/xdiff/xutils.h",
       ],
       "conditions": [
-        ["OS!='win'", {
-            "defines": [
-                "GIT_SSL"
-            ]
-        }],
         ["OS=='mac'", {
             "defines": [
-                "GIT_SECURE_TRANSPORT",
-                "GIT_CURL"
+                "GIT_SECURE_TRANSPORT"
             ],
             "sources": [
                 "libgit2/src/stransport_stream.c",
                 "libgit2/src/stransport_stream.h",
                 "libgit2/src/tls_stream.c",
-                "libgit2/src/tls_stream.h",
-                "libgit2/src/curl_stream.c",
-                "libgit2/src/curl_stream.h"
+                "libgit2/src/tls_stream.h"
             ],
             "link_settings": {
                 "xcode_settings": {
                     "OTHER_LDFLAGS": [
                         "-framework Security",
                         "-framework CoreFoundation"
                     ],
-                },
-                "libraries": [
-                    '/usr/lib/libcurl.dylib'
-                ],
+                }
             }
         }],
         ["OS=='win'", {}, {
