code review 6454090: exp/html: in parse tests, discard only one trailing newline (issue 6454090)

andyb...@gmail.com

unread,

Aug 2, 2012, 6:39:55 PM8/2/12

to nige...@golang.org, golan...@googlegroups.com, re...@codereview-hr.appspotmail.com

Reviewers: nigeltao,

Message:
Hello nige...@golang.org (cc: golan...@googlegroups.com),

I'd like you to review this change to
https://go.googlecode.com/hg/

Description:
exp/html: in parse tests, discard only one trailing newline

Pass 2 additional tests.

Please review this at http://codereview.appspot.com/6454090/

Affected files:
M src/pkg/exp/html/parse_test.go
M src/pkg/exp/html/testlogs/tests16.dat.log
M src/pkg/exp/html/testlogs/tests26.dat.log

Index: src/pkg/exp/html/parse_test.go
===================================================================
--- a/src/pkg/exp/html/parse_test.go
+++ b/src/pkg/exp/html/parse_test.go
@@ -45,7 +45,10 @@
}
b = append(b, line...)
}
- text = strings.TrimRight(string(b), "\n")
+ text = string(b)
+ if strings.HasSuffix(text, "\n") {
+ text = text[:len(text)-1]
+ }
b = b[:0]

// Skip the error list.
Index: src/pkg/exp/html/testlogs/tests16.dat.log
===================================================================
--- a/src/pkg/exp/html/testlogs/tests16.dat.log
+++ b/src/pkg/exp/html/testlogs/tests16.dat.log
@@ -186,6 +186,6 @@
PASS "<iframe>...</xmp>"
PASS "<noembed></noembed>"
-FAIL "<!doctype html><table>"
+PASS "<!doctype html><table>\n"
PASS "<!doctype html><table><td><span><font></span><span>"
PARSE "<!doctype html><form><table></form><form></table></form>"
Index: src/pkg/exp/html/testlogs/tests26.dat.log
===================================================================
--- a/src/pkg/exp/html/testlogs/tests26.dat.log
+++ b/src/pkg/exp/html/testlogs/tests26.dat.log
@@ -7,7 +7,7 @@
PASS "<!DOCTYPE html><body><b><nobr>1<nobr><ins></b><i><nobr>"
PASS "<!DOCTYPE html><body><b><nobr>1<ins><nobr></b><i>2"
PASS "<!DOCTYPE html><body><b>1<nobr></b><i><nobr>2</i>"
-FAIL "<p><code x</code></p>"
+PASS "<p><code x</code></p>\n"
PASS "<!DOCTYPE html><svg><foreignObject><p><i></p>a"
PASS "<!DOCTYPE html><table><tr><td><svg><foreignObject><p><i></p>a"
PASS "<!DOCTYPE html><math><mtext><p><i></p>a"

nige...@golang.org

unread,

Aug 2, 2012, 7:29:12 PM8/2/12

to andyb...@gmail.com, golan...@googlegroups.com, re...@codereview-hr.appspotmail.com

LGTM.

http://codereview.appspot.com/6454090/

nige...@golang.org

unread,

Aug 2, 2012, 7:32:15 PM8/2/12

to andyb...@gmail.com, golan...@googlegroups.com, re...@codereview-hr.appspotmail.com

*** Submitted as
http://code.google.com/p/go/source/detail?r=853668b30673 ***

exp/html: in parse tests, discard only one trailing newline

Pass 2 additional tests.

R=nigeltao
CC=golang-dev
http://codereview.appspot.com/6454090

Committer: Nigel Tao <nige...@golang.org>

http://codereview.appspot.com/6454090/

Reply all

Reply to author

Forward