From fb351f8b8a893c2ca837fc803ed2b96bc052a7ce Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 31 May 2018 21:55:10 +0200 Subject: [PATCH 1/2] Fix accidentally committed merge conflict --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index a762830..5fff1d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -<<<<<<< HEAD -pkg/ -======= pkg ->>>>>>> adding License information and go format From 48a741f1064c0e9a4d05d382af251fc3aa0d7fe3 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 24 Jan 2018 23:25:29 -0500 Subject: [PATCH 2/2] Fix errors in test failure messages. --- ntlm/ntlmv1_test.go | 2 +- ntlm/ntlmv2_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntlm/ntlmv1_test.go b/ntlm/ntlmv1_test.go index e175557..eaa6331 100644 --- a/ntlm/ntlmv1_test.go +++ b/ntlm/ntlmv1_test.go @@ -62,7 +62,7 @@ func TestNtlmV1ExtendedSessionSecurity(t *testing.T) { context.SetServerChallenge(c.ServerChallenge) err = context.ProcessAuthenticateMessage(msg) if err == nil { - t.Errorf("This message should have failed to authenticate, but it passed", err) + t.Error("This message should have failed to authenticate, but it passed") } } diff --git a/ntlm/ntlmv2_test.go b/ntlm/ntlmv2_test.go index 0ec0532..b36f906 100644 --- a/ntlm/ntlmv2_test.go +++ b/ntlm/ntlmv2_test.go @@ -172,7 +172,7 @@ func TestNTLMv2WithDomain(t *testing.T) { err := server.ProcessAuthenticateMessage(a) if err != nil { - t.Error("Could not process authenticate message: %s\n", err) + t.Errorf("Could not process authenticate message: %s\n", err) } }