Merge lp:~wallyworld/juju-core/fix-fake-tools-trusty into lp:juju-core/1.18

[Ian Booth]

Simple fix to update the fake tools upload so that we always include tools for precise and trusty no matter what series the tests are run on.

Simple fix to update the fake tools upload so that we always include tools for precise and trusty no matter what series the tests are run on.

[John A Meinel (jameinel)]

Does this do both Precise and Trusty? It looks like it only does 1 "Latest"
LTS (so only Trusty at this point).

On Mon, May 12, 2014 at 7:35 AM, Ian Booth <email address hidden> wrote:

> Ian Booth has proposed merging
> lp:~wallyworld/juju-core/fix-fake-tools-trusty into lp:juju-core/1.18.
>
> Commit message:
> Simple fix to update the fake tools upload so that we always include tools
> for precise and trusty no matter what series the tests are run on.
>
> Requested reviews:
> juju hackers (juju)
> Related bugs:
> Bug #1312176 in juju-core: "test suite fails on Precise now that Trusty
> is released"
> https://bugs.launchpad.net/juju-core/+bug/1312176
>
> For more details, see:
>
> https://code.launchpad.net/~wallyworld/juju-core/fix-fake-tools-trusty/+merge/219132
>
> Simple fix to update the fake tools upload so that we always include tools
> for precise and trusty no matter what series the tests are run on.
> --
>
> https://code.launchpad.net/~wallyworld/juju-core/fix-fake-tools-trusty/+merge/219132
> You are subscribed to branch lp:juju-core/1.18.
>
> === modified file 'environs/testing/tools.go'
> --- environs/testing/tools.go 2014-04-04 14:01:14 +0000
> +++ environs/testing/tools.go 2014-05-12 03:34:34 +0000
> @@ -13,6 +13,7 @@
>
> agenttools "launchpad.net/juju-core/agent/tools"
> "launchpad.net/juju-core/environs"
> + "launchpad.net/juju-core/environs/config"
> "launchpad.net/juju-core/environs/simplestreams"
> "launchpad.net/juju-core/environs/storage"
> envtools "launchpad.net/juju-core/environs/tools"
> @@ -162,7 +163,7 @@
> func uploadFakeTools(stor storage.Storage) error {
> versions := []version.Binary{version.Current}
> toolsVersion := version.Current
> - latestLts := coretesting.FakeDefaultSeries
> + latestLts := config.LatestLtsSeries()
> if toolsVersion.Series != latestLts {
> toolsVersion.Series = latestLts
> versions = append(versions, toolsVersion)
>
>
>

[Ian Booth (wallyworld)]

I tested with various combintions: version.Current.Series = precise/trusty, LatestLts() = precise/trusty
The key as far as I can see is that we upload tools for at least latest lts plus whatever series the tests run on.

=== modified file 'environs/testing/tools.go'
--- environs/testing/tools.go	2014-04-04 14:01:14 +0000
+++ environs/testing/tools.go	2014-05-12 03:34:34 +0000
@@ -13,6 +13,7 @@
 
 	agenttools "launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/environs/simplestreams"
 	"launchpad.net/juju-core/environs/storage"
 	envtools "launchpad.net/juju-core/environs/tools"
@@ -162,7 +163,7 @@
 func uploadFakeTools(stor storage.Storage) error {
 	versions := []version.Binary{version.Current}
 	toolsVersion := version.Current
-	latestLts := coretesting.FakeDefaultSeries
+	latestLts := config.LatestLtsSeries()
 	if toolsVersion.Series != latestLts {
 		toolsVersion.Series = latestLts
 		versions = append(versions, toolsVersion)