environs/ec2: specify public-bucket-region

environs/ec2/local_test.go

 package ec2_test
 
 import (
         "launchpad.net/goamz/aws"
         amzec2 "launchpad.net/goamz/ec2"
         "launchpad.net/goamz/ec2/ec2test"
         "launchpad.net/goamz/s3"
         "launchpad.net/goamz/s3/s3test"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/ec2"
         "launchpad.net/juju-core/environs/jujutest"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
         "launchpad.net/juju-core/version"
         "regexp"
         "strings"
 )
 
 func registerLocalTests() {
         // N.B. Make sure the region we use here
         // has entries in the images/query txt files.
         aws.Regions["test"] = aws.Region{
                 Name: "test",
         }
         attrs := map[string]interface{}{
-                "name":            "sample",
-                "type":            "ec2",
-                "region":          "test",
-                "control-bucket":  "test-bucket",
-                "public-bucket":   "public-tools",
-                "admin-secret":    "local-secret",
-                "access-key":      "x",
-                "secret-key":      "x",
-                "authorized-keys": "foo",
-                "ca-cert":         testing.CACertPEM,
-                "ca-private-key":  testing.CAKeyPEM,
+                "name":                 "sample",
+                "type":                 "ec2",
+                "region":               "test",
+                "control-bucket":       "test-bucket",
+                "public-bucket":        "public-tools",
+                "public-bucket-region": "test",

[niemeyer, 2012/11/27 11:40:47]

What's the effect of this change? There's nothing in the test verifying this.
This sounds similar to the previous CL where there were changes here too.

[dfc, 2012/11/27 11:50:02]

This is required. If it is not here then public-bucket-region will take the
schema default and try to access the real juju-dist bucket and the test will
fail.

+                "admin-secret":         "local-secret",
+                "access-key":           "x",
+                "secret-key":           "x",
+                "authorized-keys":      "foo",
+                "ca-cert":              testing.CACertPEM,
+                "ca-private-key":       testing.CAKeyPEM,
         }
 
         Suite(&localServerSuite{
                 Tests: jujutest.Tests{
                         Config: attrs,
                 },
         })
         Suite(&localLiveSuite{
                 LiveTests: LiveTests{
                         LiveTests: jujutest.LiveTests{
@@ skipping 260 matching lines @@
                         found = true
                 }
         }
         switch {
         case match && !found:
                 c.Errorf("package %q not found in %v", pkg, pkgs)
         case !match && found:
                 c.Errorf("%q found but not expected in %v", pkg, pkgs)
         }
 }