| Index: environs/tools_test.go |
| === modified file 'environs/tools_test.go' |
| --- environs/tools_test.go 2012-05-22 08:55:34 +0000 |
| +++ environs/tools_test.go 2012-05-28 07:44:24 +0000 |
| @@ -44,12 +44,8 @@ |
| return v |
| } |
| -func toolsPathForVersion(v version.Version, series, arch string) string { |
| - return fmt.Sprintf("tools/juju-%v-%s-%s.tgz", v, series, arch) |
| -} |
| - |
| func mkToolsPath(vers string) string { |
| - return toolsPathForVersion(mkVersion(vers), environs.CurrentSeries, environs.CurrentArch) |
| + return environs.ToolsPath(mkVersion(vers), environs.CurrentSeries, environs.CurrentArch) |
| } |
| var _ = Suite(&ToolsSuite{}) |
| @@ -202,8 +198,8 @@ |
| // mismatching series or architecture is ignored. |
| version: mkVersion("1.0.0"), |
| contents: []string{ |
| - toolsPathForVersion(mkVersion("1.9.9"), "foo", environs.CurrentArch), |
| - toolsPathForVersion(mkVersion("1.9.9"), environs.CurrentSeries, "foo"), |
| + environs.ToolsPath(mkVersion("1.9.9"), "foo", environs.CurrentArch), |
| + environs.ToolsPath(mkVersion("1.9.9"), environs.CurrentSeries, "foo"), |
| mkToolsPath("1.0.0"), |
| }, |
| expect: mkToolsPath("1.0.0"), |
