environs/jujutest: simplify interface

environs/ec2/local_test.go

 package ec2_test
 
 import (
         "fmt"
         "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/config"
         "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",
         }
-        // N.B. Make sure the region we use here
-        // has entries in the images/query txt files.
         cfg, err := config.New(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",
         })
@@ skipping 272 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)
         }
 }