]> Cypherpunks repositories - gostls13.git/commitdiff
net/textproto: prevent test from failing with nil pointer dereference
authorMarat Khabibullin <marat.khabibullin@jetbrains.com>
Wed, 13 Feb 2019 19:19:33 +0000 (19:19 +0000)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 26 Feb 2019 18:40:29 +0000 (18:40 +0000)
The variable err could have nil value when we call err.Error(),
because after we check it for nil above we continue the test
(t.Errorf doesn't stop the test execution).

Updates #30208

Change-Id: Ibcf38698326c69c06068989510311e37806995c6
GitHub-Last-Rev: 3ab20f6d7fe34ed9b777e0894b57166d173de8ca
GitHub-Pull-Request: golang/go#30214
Reviewed-on: https://go-review.googlesource.com/c/162457
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/net/textproto/reader_test.go

index f85fbdc36d7d9d14348dc8cf8312c9b7dcef9ad7..6d9bcd841bcd7627e9e217a3c46a35c90e221051 100644 (file)
@@ -332,7 +332,7 @@ func TestReadMultiLineError(t *testing.T) {
        if msg != wantMsg {
                t.Errorf("ReadResponse: msg=%q, want %q", msg, wantMsg)
        }
-       if err.Error() != "550 "+wantMsg {
+       if err != nil && err.Error() != "550 "+wantMsg {
                t.Errorf("ReadResponse: error=%q, want %q", err.Error(), "550 "+wantMsg)
        }
 }