state: add CACert to Info.

environs/ec2/config_test.go

 package ec2
 
 import (
         "io/ioutil"
         "launchpad.net/goamz/aws"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/testing"
@@ skipping 33 matching lines @@
         err          string
 }
 
 type attrs map[string]interface{}
 
 func (t configTest) check(c *C) {
         envs := attrs{
                 "environments": attrs{
                         "testenv": attrs{
                                 "type":           "ec2",
-                                "ca-cert":        testing.CACertPEM,
-                                "ca-private-key": testing.CAKeyPEM,
+                                "ca-cert":        testing.CACert,
+                                "ca-private-key": testing.CAKey,
                         },
                 },
         }
         testenv := envs["environments"].(attrs)["testenv"].(attrs)
         for k, v := range t.config {
                 testenv[k] = v
         }
         if _, ok := testenv["control-bucket"]; !ok {
                 testenv["control-bucket"] = "x"
         }
@@ skipping 200 matching lines @@
         }
 }
 
 func (s *ConfigSuite) TestMissingAuth(c *C) {
         os.Setenv("AWS_ACCESS_KEY_ID", "")
         os.Setenv("AWS_SECRET_ACCESS_KEY", "")
         test := configTests[0]
         test.err = "environment has no access-key or secret-key"
         test.check(c)
 }