cmd/go: fix bug in remote package discovery

The parser was assuming it would find <body> or </head>. If the entire response is just <meta> tags, it finds EOF and treats that as an error. It's not. LGTM=bradfitz R=bradfitz CC=golang-codereviews https://golang.org/cl/68520044

cmd/go: fix bug in remote package discovery
The parser was assuming it would find <body> or </head>. If the entire response is just <meta> tags, it finds EOF and treats that as an error. It's not. LGTM=bradfitz R=bradfitz CC=golang-codereviews https://golang.org/cl/68520044
441c4bb9 · Russ Cox · fd4b4b56 · 441c4bb9 · 441c4bb9
Commit 441c4bb9 authored Feb 25, 2014 by Russ Cox
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 1 deletion

src/cmd/go/discovery.go src/cmd/go/discovery.go +3 -0

src/cmd/go/pkg_test.go src/cmd/go/pkg_test.go +47 -1

No files found.
--- a/src/cmd/go/discovery.go
+++ b/src/cmd/go/discovery.go
@@ -43,6 +43,9 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
 	for {
 		t, err = d.Token()
 		if err != nil {
+			if err == io.EOF {
+				err = nil
+			}
 			return
 		}
 		if e, ok := t.(xml.StartElement); ok && strings.EqualFold(e.Name.Local, "body") {

--- a/src/cmd/go/pkg_test.go
+++ b/src/cmd/go/pkg_test.go
@@ -4,7 +4,11 @@

 package main

-import "testing"
+import (
+	"reflect"
+	"strings"
+	"testing"
+)

 var foldDupTests = []struct {
 	list   []string
@@ -25,3 +29,45 @@ func TestFoldDup(t *testing.T) {
 		}
 	}
 }
+
+var parseMetaGoImportsTests = []struct {
+	in  string
+	out []metaImport
+}{
+	{
+		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">`,
+		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
+	},
+	{
+		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
+		<meta name="go-import" content="baz/quux git http://github.com/rsc/baz/quux">`,
+		[]metaImport{
+			{"foo/bar", "git", "https://github.com/rsc/foo/bar"},
+			{"baz/quux", "git", "http://github.com/rsc/baz/quux"},
+		},
+	},
+	{
+		`<head>
+		<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
+		</head>`,
+		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
+	},
+	{
+		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
+		<body>`,
+		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
+	},
+}
+
+func TestParseMetaGoImports(t *testing.T) {
+	for i, tt := range parseMetaGoImportsTests {
+		out, err := parseMetaGoImports(strings.NewReader(tt.in))
+		if err != nil {
+			t.Errorf("test#%d: %v", i, err)
+			continue
+		}
+		if !reflect.DeepEqual(out, tt.out) {
+			t.Errorf("test#%d:\n\thave %q\n\twant %q", i, out, tt.out)
+		}
+	}
+}