Fix tests on i386

Fix tests on i386

Various fixes to run tests on i386.

For Joyent, since it only supports
AMD64 I have modified the suites to
upload fake AMD64 tools; this involved
a change to envtesting.ToolsFixture
to parameterise UploadFakeTools.

For OpenStack, I added dummy metadata
for i386 and ppc64.

Fixes lp:1262967

https://code.launchpad.net/~axwalk/juju-core/lp1262967-tests-i386/+merge/219840

Requires: https://code.launchpad.net/~axwalk/juju-core/instances-arch-preference/+merge/219839

(do not edit description out of merge proposal)

[axw, 2014-05-16 13:15:54]

Please take a look.

[fwereade, 2014-05-16 21:08:49]

I'm not quite clear on all of these. In particular, why do we need to pretend
we're running on amd64 for joyent? To make upload-tools work?

https://codereview.appspot.com/92390046/diff/1/provider/joyent/joyent_test.go
File provider/joyent/joyent_test.go (right):

https://codereview.appspot.com/92390046/diff/1/provider/joyent/joyent_test.go...
provider/joyent/joyent_test.go:105: r :=
testing.PatchValue(&version.Current.Arch, arch.AMD64)
I has a suspicious. What tests does this fix?

https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test.go
File provider/openstack/local_test.go (right):

https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test....
provider/openstack/local_test.go:273: // Ensure amd64 tools are available, to
ensure and amd64 image.
s/and/an/

[axw, 2014-05-19 03:04:08]

Please take a look.

[axw, 2014-05-19 03:28:59]

On 2014/05/19 03:04:08, axw wrote:
> Please take a look.

Bugger, ignore that push; wrong branch.

[axw, 2014-05-19 03:29:59]

On 2014/05/19 03:28:59, axw wrote:
> On 2014/05/19 03:04:08, axw wrote:
> > Please take a look.
> 
> Bugger, ignore that push; wrong branch.

Although, it is a prereq :)

[axw, 2014-05-19 06:10:29]

Please take a look.

https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test.go
File provider/openstack/local_test.go (right):

https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test....
provider/openstack/local_test.go:273: // Ensure amd64 tools are available, to
ensure and amd64 image.
On 2014/05/16 21:08:49, fwereade wrote:
> s/and/an/

Done.

[axw, 2014-05-19 06:14:36]

On 2014/05/16 21:08:49, fwereade wrote:
> I'm not quite clear on all of these. In particular, why do we need to pretend
> we're running on amd64 for joyent? To make upload-tools work?
> 
> https://codereview.appspot.com/92390046/diff/1/provider/joyent/joyent_test.go
> File provider/joyent/joyent_test.go (right):
> 
>
https://codereview.appspot.com/92390046/diff/1/provider/joyent/joyent_test.go...
> provider/joyent/joyent_test.go:105: r :=
> testing.PatchValue(&version.Current.Arch, arch.AMD64)
> I has a suspicious. What tests does this fix?

It was a lazy/bad way of getting UploadFakeTools to do what I wanted. In
retrospect it was quite bad, because it could easily mask invalid use of
version.Current.Arch. I've added a method to environs/testing/ToolsFixture
called UploadFakeTools which does what the top-level function does, but is
parameterised by the ToolsFixture.UploadArches field.

>
https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test.go
> File provider/openstack/local_test.go (right):
> 
>
https://codereview.appspot.com/92390046/diff/1/provider/openstack/local_test....
> provider/openstack/local_test.go:273: // Ensure amd64 tools are available, to
> ensure and amd64 image.
> s/and/an/

[wallyworld, 2014-05-19 07:12:35]

LGTM

[axw, 2014-05-19 07:22:40]

Please take a look.