Reviewers: mp+168576_code.launchpad.net,

Message:
Please take a look.

Description:
charm: trivial error consistency tweak



https://code.launchpad.net/~fwereade/juju-core/config-2-trivial-error-message-change/+merge/168576

Requires:
https://code.launchpad.net/~fwereade/juju-core/config-1-rewrite-type/+merge/168575

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/10178043/

Affected files:
   A [revision details]
   M charm/repo.go
   M charm/repo_test.go
   M cmd/juju/upgradecharm_test.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: charm/repo.go
=== modified file 'charm/repo.go'
--- charm/repo.go	2013-05-02 15:55:42 +0000
+++ charm/repo.go	2013-06-10 20:50:42 +0000
@@ -292,7 +292,7 @@
  }

  func charmNotFound(curl *URL, repoPath string) error {
-	return &NotFoundError{fmt.Sprintf("no charms found matching %q in %s",  
curl, repoPath)}
+	return &NotFoundError{fmt.Sprintf("charm not found in %q: %s", repoPath,  
curl)}
  }

  func mightBeCharm(info os.FileInfo) bool {


Index: charm/repo_test.go
=== modified file 'charm/repo_test.go'
--- charm/repo_test.go	2013-05-31 02:37:23 +0000
+++ charm/repo_test.go	2013-06-10 20:50:42 +0000
@@ -413,15 +413,22 @@
  	return testing.Charms.ClonedDirPath(s.seriesPath, name)
  }

+func (s *LocalRepoSuite) checkNotFoundErr(c *C, err error, curl  
*charm.URL) {
+	expect := `charm not found in "` + s.repo.Path + `": ` + curl.String()
+	c.Check(err, ErrorMatches, expect)
+}
+
  func (s *LocalRepoSuite) TestMissingCharm(c *C) {
-	_, err := s.repo.Latest(charm.MustParseURL("local:series/zebra"))
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:series/zebra" in `+s.repo.Path)
-	_, err = s.repo.Get(charm.MustParseURL("local:series/zebra"))
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:series/zebra" in `+s.repo.Path)
-	_, err = s.repo.Latest(charm.MustParseURL("local:badseries/zebra"))
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:badseries/zebra" in `+s.repo.Path)
-	_, err = s.repo.Get(charm.MustParseURL("local:badseries/zebra"))
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:badseries/zebra" in `+s.repo.Path)
+	for i, str := range []string{
+		"local:series/zebra", "local:badseries/zebra",
+	} {
+		c.Logf("test %d: %s", i, str)
+		curl := charm.MustParseURL(str)
+		_, err := s.repo.Latest(curl)
+		s.checkNotFoundErr(c, err, curl)
+		_, err = s.repo.Get(curl)
+		s.checkNotFoundErr(c, err, curl)
+	}
  }

  func (s *LocalRepoSuite) TestMissingRepo(c *C) {
@@ -467,8 +474,8 @@
  	rev, err = s.repo.Latest(badRevCurl)
  	c.Assert(err, IsNil)
  	c.Assert(rev, Equals, 2)
-	ch, err = s.repo.Get(badRevCurl)
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:series/upgrade-33" in `+s.repo.Path)
+	_, err = s.repo.Get(badRevCurl)
+	s.checkNotFoundErr(c, err, badRevCurl)
  }

  func (s *LocalRepoSuite) TestBundle(c *C) {
@@ -519,8 +526,8 @@
  	curl := charm.MustParseURL("local:series/dummy")

  	_, err = s.repo.Get(curl)
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:series/dummy" in `+s.repo.Path)
+	s.checkNotFoundErr(c, err, curl)
  	_, err = s.repo.Latest(curl)
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:series/dummy" in `+s.repo.Path)
+	s.checkNotFoundErr(c, err, curl)
  	c.Assert(c.GetTestLog(), Equals, "")
  }


Index: cmd/juju/upgradecharm_test.go
=== modified file 'cmd/juju/upgradecharm_test.go'
--- cmd/juju/upgradecharm_test.go	2013-05-16 15:37:05 +0000
+++ cmd/juju/upgradecharm_test.go	2013-06-10 20:50:42 +0000
@@ -46,7 +46,7 @@
  	// overwrites it (TearDownTest will revert it again).
  	os.Setenv("JUJU_REPOSITORY", "")
  	err = runUpgradeCharm(c, "riak", "--repository=")
-	c.Assert(err, ErrorMatches, `no charms found  
matching "local:precise/riak" in .*`)
+	c.Assert(err, ErrorMatches, `charm not found in ".*": local:precise/riak`)
  }

  func (s *UpgradeCharmErrorsSuite) TestInvalidService(c *C) {