Merge pull request JuliaLang#23573 from JuliaLang/cv/libgit2-helper-e…

…rror Refactor LibGit2 credential_loop tests
tpapp · Sep 7, 2017 · 4c8e693 · 4c8e693
2 parents caad8b2 + 10cf8a2
commit 4c8e693
Show file tree

Hide file tree

Showing 3 changed files with 168 additions and 170 deletions.
diff --git a/test/TestHelpers.jl b/test/TestHelpers.jl
@@ -53,7 +53,7 @@ function with_fake_pty(f)
  end
 end
 
-function challenge_prompt(code::AbstractString, challenges; timeout::Integer=10, debug::Bool=true)
+function challenge_prompt(code::Expr, challenges; timeout::Integer=10, debug::Bool=true)
  output_file = tempname()
  wrapped_code = """
  result = let

diff --git a/test/libgit2-helpers.jl b/test/libgit2-helpers.jl
@@ -39,7 +39,14 @@ function credential_loop(
  end
  end
 
- return err, num_authentications
+ # Note: LibGit2.GitError(0) will not work if an error message has been set.
+ git_error = if err == 0
+ LibGit2.GitError(LibGit2.Error.None, LibGit2.Error.GIT_OK, "No errors")
+ else
+ LibGit2.GitError(err)
+ end
+
+ return git_error, num_authentications
 end
 
 function credential_loop(