]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: fix bug in remote package discovery
authorRuss Cox <rsc@golang.org>
Tue, 25 Feb 2014 16:22:22 +0000 (11:22 -0500)
committerRuss Cox <rsc@golang.org>
Tue, 25 Feb 2014 16:22:22 +0000 (11:22 -0500)
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

src/cmd/go/discovery.go
src/cmd/go/pkg_test.go

index 75228b52a5f3f154a6ba2cc40faa8b4fd3c20ea6..b9f42799546e306f8f3762d00d2c6d273d3e50a2 100644 (file)
@@ -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") {
index f3590b96323f104d7b2506c19ba7ea2516a75f16..06b9f0ac6ebcb0fe1802756c8355edc86d07b72d 100644 (file)
@@ -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)
+               }
+       }
+}