state/api/params: add CharmURL to ServiceInfo

state/unit_test.go

 package state_test
 
 import (
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/state"
         "sort"
         "strconv"
         "time"
 )
@@ skipping 203 matching lines @@
         rel, err := s.State.AddRelation(eps...)
         c.Assert(err, IsNil)
         ru, err := rel.Unit(s.unit)
         c.Assert(err, IsNil)
         err = ru.EnterScope(nil)
         c.Assert(err, IsNil)
         subUnit, err := s.State.Unit("logging/0")
         c.Assert(err, IsNil)
 
         info := state.TestingStateInfo()
-        st, err := state.Open(info)
+        st, err := state.Open(info, state.TestingDialTimeout)
         c.Assert(err, IsNil)
         defer st.Close()
         // Turn on fully-authenticated mode.
         err = st.SetAdminMongoPassword("admin-secret")
         c.Assert(err, IsNil)
 
         // Add a new machine, assign the units to it
         // and set its password.
         m, err := st.AddMachine("series", state.JobHostUnits)
         c.Assert(err, IsNil)
         unit, err := st.Unit(s.unit.Name())
         c.Assert(err, IsNil)
         subUnit, err = st.Unit(subUnit.Name())
         c.Assert(err, IsNil)
         err = unit.AssignToMachine(m)
         c.Assert(err, IsNil)
         err = m.SetMongoPassword("foo")
         c.Assert(err, IsNil)
 
         // Sanity check that we cannot connect with the wrong
         // password
         info.EntityName = m.EntityName()
         info.Password = "foo1"
         err = tryOpenState(info)
         c.Assert(state.IsUnauthorizedError(err), Equals, true)
 
         // Connect as the machine entity.
         info.EntityName = m.EntityName()
         info.Password = "foo"
-        st1, err := state.Open(info)
+        st1, err := state.Open(info, state.TestingDialTimeout)
         c.Assert(err, IsNil)
         defer st1.Close()
 
         // Change the password for a unit derived from
         // the machine entity's state.
         unit, err = st1.Unit(s.unit.Name())
         c.Assert(err, IsNil)
         err = unit.SetMongoPassword("bar")
         c.Assert(err, IsNil)
 
         // Now connect as the unit entity and, as that
         // that entity, change the password for a new unit.
         info.EntityName = unit.EntityName()
         info.Password = "bar"
-        st2, err := state.Open(info)
+        st2, err := state.Open(info, state.TestingDialTimeout)
         c.Assert(err, IsNil)
         defer st2.Close()
 
         // Check that we can set its password.
         unit, err = st2.Unit(subUnit.Name())
         c.Assert(err, IsNil)
         err = unit.SetMongoPassword("bar2")
         c.Assert(err, IsNil)
 
         // Clear the admin password, so tests can reset the db.
@@ skipping 452 matching lines @@
         err := s.unit.SetAnnotations(annotations)
         c.Assert(err, IsNil)
         err = s.unit.EnsureDead()
         c.Assert(err, IsNil)
         err = s.unit.Remove()
         c.Assert(err, IsNil)
         ann, err := s.unit.Annotations()
         c.Assert(err, IsNil)
         c.Assert(ann, DeepEquals, make(map[string]string))
 }