state/api/params: add CharmURL to ServiceInfo

charm/dir_test.go

 package charm_test
 
 import (
         "archive/zip"
         "bytes"
         "fmt"
         "io/ioutil"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/log"
@@ skipping 119 matching lines @@
         path := filepath.Join(c.MkDir(), "bundle.charm")
         file, err := os.Create(path)
         c.Assert(err, IsNil)
         err = dir.BundleTo(file)
         file.Close()
         c.Assert(err, IsNil)
 
         tlog := c.GetTestLog()
         for _, hook := range hooks {
                 fullpath := filepath.Join(dir.Path, "hooks", hook)
-                exp := fmt.Sprintf(`^(.|\n)*WARNING: charm: making "%s" executable in charm(.|\n)*$`, fullpath)
+                exp := fmt.Sprintf(`^(.|\n)*WARNING charm: making "%s" executable in charm(.|\n)*$`, fullpath)
                 c.Assert(tlog, Matches, exp, Commentf("hook %q was not made executable", fullpath))
         }
 
         // Expand it and check the hooks' permissions
         // (But do not use ExpandTo(), just use the raw zip)
         f, err := os.Open(path)
         c.Assert(err, IsNil)
         defer f.Close()
         fi, err := f.Stat()
         c.Assert(err, IsNil)
@@ skipping 101 matching lines @@
         c.Assert(err, IsNil)
 
         c.Assert(dir.Revision(), Equals, 1)
         dir.SetDiskRevision(42)
         c.Assert(dir.Revision(), Equals, 42)
 
         dir, err = charm.ReadDir(charmDir)
         c.Assert(err, IsNil)
         c.Assert(dir.Revision(), Equals, 42)
 }