1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
|
Description: Fix HTTP-01 and TLS-SNI invalid port tests for go 1.8
Author: xenolf <xenolf@users.noreply.github.com>
Applied-Upstream: https://github.com/xenolf/lego/commit/3db48c9e13db71b5c070aa4a6bd309ef5710022a
Last-Updated: 2017-07-24
---
Index: golang-github-xenolf-lego/acme/http_challenge_test.go
===================================================================
--- golang-github-xenolf-lego.orig/acme/http_challenge_test.go
+++ golang-github-xenolf-lego/acme/http_challenge_test.go
@@ -51,7 +51,7 @@ func TestHTTPChallengeInvalidPort(t *tes
if err := solver.Solve(clientChallenge, "localhost:123456"); err == nil {
t.Errorf("Solve error: got %v, want error", err)
- } else if want := "invalid port 123456"; !strings.HasSuffix(err.Error(), want) {
+ } else if want, want18 := "invalid port 123456", "123456: invalid port"; !strings.HasSuffix(err.Error(), want) && !strings.HasSuffix(err.Error(), want18) {
t.Errorf("Solve error: got %q, want suffix %q", err.Error(), want)
}
}
Index: golang-github-xenolf-lego/acme/tls_sni_challenge_test.go
===================================================================
--- golang-github-xenolf-lego.orig/acme/tls_sni_challenge_test.go
+++ golang-github-xenolf-lego/acme/tls_sni_challenge_test.go
@@ -59,7 +59,7 @@ func TestTLSSNIChallengeInvalidPort(t *t
if err := solver.Solve(clientChallenge, "localhost:123456"); err == nil {
t.Errorf("Solve error: got %v, want error", err)
- } else if want := "invalid port 123456"; !strings.HasSuffix(err.Error(), want) {
+ } else if want, want18 := "invalid port 123456", "123456: invalid port"; !strings.HasSuffix(err.Error(), want) && !strings.HasSuffix(err.Error(), want18) {
t.Errorf("Solve error: got %q, want suffix %q", err.Error(), want)
}
}
|