← Back to branch summary

~fwereade/juju-core/errors-cleanup

« back to all changes in this revision

Viewing changes to testing/charm.go

  • Committer: William Reade
  • Date: 2013-06-12 12:13:29 UTC
  • Revision ID: fwereade@gmail.com-20130612121329-2aowsnbqt7zuzw3k
mock charm store now uses errors.NotFoundError

Show diffs side-by-side

added added

removed removed

Lines of Context:
testing/charm.go
6
6
import (
7
7
        "fmt"
8
8
        "go/build"
9
 
        "launchpad.net/juju-core/charm"
10
9
        "os"
11
10
        "os/exec"
12
11
        "path/filepath"
 
12
 
 
13
        "launchpad.net/juju-core/charm"
 
14
        "launchpad.net/juju-core/errors"
13
15
)
14
16
 
15
17
func init() {
169
171
        base, rev := s.interpret(charmURL)
170
172
        charm, found := s.charms[base][rev]
171
173
        if !found {
172
 
                return nil, fmt.Errorf("charm not found in mock store: %s", charmURL)
 
174
                return nil, errors.RawNotFoundf("charm %q not found in mock store", charmURL)
173
175
        }
174
176
        return charm, nil
175
177
}
179
181
        charmURL = charmURL.WithRevision(-1)
180
182
        base, rev := s.interpret(charmURL)
181
183
        if _, found := s.charms[base][rev]; !found {
182
 
                return 0, fmt.Errorf("charm not found in mock store: %s", charmURL)
 
184
                return 0, errors.RawNotFoundf("charm %q not found in mock store", charmURL)
183
185
        }
184
186
        return rev, nil
185
187
}