state/api/params: add CharmURL to ServiceInfo

cmd/jujud/bootstrap_test.go

 package main
 
 import (
         "encoding/base64"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs/agent"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
@@ skipping 48 matching lines @@
 
 func (s *BootstrapSuite) TestInitializeEnvironment(c *C) {
         _, cmd, err := s.initBootstrapCommand(c, "--env-config", testConfig)
         c.Assert(err, IsNil)
         err = cmd.Run(nil)
         c.Assert(err, IsNil)
 
         st, err := state.Open(&state.Info{
                 Addrs:  []string{testing.MgoAddr},
                 CACert: []byte(testing.CACert),
-        })
+        }, state.DefaultDialTimeout)
         c.Assert(err, IsNil)
         defer st.Close()
         machines, err := st.AllMachines()
         c.Assert(err, IsNil)
         c.Assert(len(machines), Equals, 1)
 
         instid, ok := machines[0].InstanceId()
         c.Assert(ok, Equals, true)
         c.Assert(instid, Equals, state.InstanceId("dummy.instance.id"))
 
         cons, err := st.EnvironConstraints()
         c.Assert(err, IsNil)
         c.Assert(cons, DeepEquals, constraints.Value{})
 }
 
 func (s *BootstrapSuite) TestSetConstraints(c *C) {
         tcons := constraints.Value{Mem: uint64p(2048), CpuCores: uint64p(2)}
         _, cmd, err := s.initBootstrapCommand(c, "--env-config", testConfig, "--constraints", tcons.String())
         c.Assert(err, IsNil)
         err = cmd.Run(nil)
         c.Assert(err, IsNil)
 
         st, err := state.Open(&state.Info{
                 Addrs:  []string{testing.MgoAddr},
                 CACert: []byte(testing.CACert),
-        })
+        }, state.DefaultDialTimeout)
         c.Assert(err, IsNil)
         defer st.Close()
         cons, err := st.EnvironConstraints()
         c.Assert(err, IsNil)
         c.Assert(cons, DeepEquals, tcons)
 }
 
 func uint64p(v uint64) *uint64 {
         return &v
 }
 
 func (s *BootstrapSuite) TestMachinerWorkers(c *C) {
         _, cmd, err := s.initBootstrapCommand(c, "--env-config", testConfig)
         c.Assert(err, IsNil)
         err = cmd.Run(nil)
         c.Assert(err, IsNil)
 
         st, err := state.Open(&state.Info{
                 Addrs:  []string{testing.MgoAddr},
                 CACert: []byte(testing.CACert),
-        })
+        }, state.DefaultDialTimeout)
         c.Assert(err, IsNil)
         defer st.Close()
         m, err := st.Machine("0")
         c.Assert(err, IsNil)
         c.Assert(m.Jobs(), DeepEquals, []state.MachineJob{state.JobManageEnviron, state.JobServeAPI})
 }
 
 func testOpenState(c *C, info *state.Info, expectErr error) {
-        st, err := state.Open(info)
+        st, err := state.Open(info, state.DefaultDialTimeout)
         if st != nil {
                 st.Close()
         }
         if expectErr != nil {
                 c.Assert(state.IsUnauthorizedError(err), Equals, true)
         } else {
                 c.Assert(err, IsNil)
         }
 }
 
@@ skipping 12 matching lines @@
         info := &state.Info{
                 Addrs:  []string{testing.MgoAddr},
                 CACert: []byte(testing.CACert),
         }
         testOpenState(c, info, state.Unauthorizedf("some auth problem"))
 
         info.EntityName, info.Password = "machine-0", "foo"
         testOpenState(c, info, nil)
 
         info.EntityName = ""
-        st, err := state.Open(info)
+        st, err := state.Open(info, state.DefaultDialTimeout)
         c.Assert(err, IsNil)
         defer st.Close()
 
         // Reset password so the tests can continue to use the same server.
         err = st.SetAdminMongoPassword("")
         c.Assert(err, IsNil)
 }
 
 var base64ConfigTests = []struct {
         input    []string
@@ skipping 48 matching lines @@
         return base64.StdEncoding.EncodeToString(data)
 }
 
 var testConfig = b64yaml{
         "name":            "dummyenv",
         "type":            "dummy",
         "state-server":    false,
         "authorized-keys": "i-am-a-key",
         "ca-cert":         testing.CACert,
 }.encode()