environs/ec2: make tests pass under quantal-i386

environs/ec2: make tests pass under quantal-i386

Also a few other cleanups. We use data (testImagesContent
and testInstanceTypeContent) closer to where it's used,
and change things to be slightly more idiomatic in places.

The right eventual fix, I think, for the original issue
is to fix version.Current for the tests, but this should
do until then.

https://code.launchpad.net/~rogpeppe/juju-core/255-fix-ec2-quantal-386/+merge/155282

(do not edit description out of merge proposal)

[rog, 2013-03-25 17:12:32]

Please take a look.

[fwereade, 2013-03-25 17:17:55]

LGTM, nice.

[dimitern, 2013-03-25 17:23:49]

LGTM

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/export_test.go
File environs/ec2/export_test.go (right):

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/export_test.go#...
environs/ec2/export_test.go:71: //
d?

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/local_test.go
File environs/ec2/local_test.go (right):

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/local_test.go#n...
environs/ec2/local_test.go:45: // testInstanceTypeContent holds the cost in
USDe-3/hour for each of the
s/USDe-3/USD/?

[rog, 2013-03-25 18:21:12]

*** Submitted:

environs/ec2: make tests pass under quantal-i386

Also a few other cleanups. We use data (testImagesContent
and testInstanceTypeContent) closer to where it's used,
and change things to be slightly more idiomatic in places.

The right eventual fix, I think, for the original issue
is to fix version.Current for the tests, but this should
do until then.

R=fwereade, dimitern
CC=
https://codereview.appspot.com/8016043

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/export_test.go
File environs/ec2/export_test.go (right):

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/export_test.go#...
environs/ec2/export_test.go:71: //
On 2013/03/25 17:23:49, dimitern wrote:
> d?

Done.

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/local_test.go
File environs/ec2/local_test.go (right):

https://codereview.appspot.com/8016043/diff/5001/environs/ec2/local_test.go#n...
environs/ec2/local_test.go:45: // testInstanceTypeContent holds the cost in
USDe-3/hour for each of the
On 2013/03/25 17:23:49, dimitern wrote:
> s/USDe-3/USD/?

i think the units are 0.1 cents. the comment is as it was originally - i'll
leave it be for the time being anyway.


that said, the "020" below looks fishy. i wonder if fwereade really intended to
use an octal constant there (and in the real data)