downloader: Avoid noise in download error

Do't annotate to avoid unnecessary information in the error.
sdg0919 · Sep 26, 2016 · f1f40de · f1f40de
1 parent f376b9d
commit f1f40de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/downloader/download.go b/downloader/download.go
@@ -89,7 +89,7 @@ func (dl *Download) run(req Request) {
 	// disableSSLHostnameVerification behavior here.
 	filename, err := dl.download(req)
 	if err != nil {
-		err = errors.Annotatef(err, "cannot download %q", req.URL)
+		err = errors.Trace(err)
 	} else {
 		logger.Infof("download complete (%q)", req.URL)
 		err = verifyDownload(filename, req)

diff --git a/downloader/download_test.go b/downloader/download_test.go
@@ -91,7 +91,7 @@ func (s *DownloadSuite) TestDownloadError(c *gc.C) {
 	)
 	filename, err := d.Wait()
 	c.Assert(filename, gc.Equals, "")
-	c.Assert(err, gc.ErrorMatches, `cannot download ".*": bad http response: 404 Not Found`)
+	c.Assert(err, gc.ErrorMatches, `bad http response: 404 Not Found`)
 	checkDirEmpty(c, tmp)
 }
 
@@ -154,7 +154,7 @@ func (s *DownloadSuite) TestAbort(c *gc.C) {
 	)
 	filename, err := dl.Wait()
 	c.Check(filename, gc.Equals, "")
-	c.Check(err, gc.ErrorMatches, ".+ download aborted")
+	c.Check(err, gc.ErrorMatches, "download aborted")
 	checkDirEmpty(c, tmp)
 }
 

diff --git a/worker/uniter/charm/bundles_test.go b/worker/uniter/charm/bundles_test.go
@@ -111,12 +111,12 @@ func (s *BundlesDirSuite) TestGet(c *gc.C) {
 
 	// Try to get the charm when the content doesn't match.
 	_, err = d.Read(&fakeBundleInfo{apiCharm, nil, "..."}, nil)
-	c.Assert(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/dummy-1" from API server: `)+`expected sha256 "...", got ".*"`)
+	c.Check(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/dummy-1" from API server: `)+`expected sha256 "...", got ".*"`)
 
 	// Try to get a charm whose bundle doesn't exist.
 	otherURL := corecharm.MustParseURL("cs:quantal/spam-1")
 	_, err = d.Read(&fakeBundleInfo{apiCharm, otherURL, ""}, nil)
-	c.Assert(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/spam-1" from API server: `)+`.* not found`)
+	c.Check(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/spam-1" from API server: `)+`.* not found`)
 
 	// Get a charm whose bundle exists and whose content matches.
 	ch, err := d.Read(apiCharm, nil)
@@ -135,8 +135,8 @@ func (s *BundlesDirSuite) TestGet(c *gc.C) {
 	close(abort)
 
 	ch, err = d.Read(apiCharm, abort)
-	c.Assert(ch, gc.IsNil)
-	c.Assert(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/dummy-1" from API server: download aborted`))
+	c.Check(ch, gc.IsNil)
+	c.Check(err, gc.ErrorMatches, regexp.QuoteMeta(`failed to download charm "cs:quantal/dummy-1" from API server: download aborted`))
 }
 
 func assertCharm(c *gc.C, bun charm.Bundle, sch *state.Charm) {