errors: Improve tests, unify interfaces, wrapping

worker/provisioner/lxc-broker_test.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package provisioner_test
 
 import (
         "fmt"
         "io/ioutil"
         "path/filepath"
         "time"
@@ skipping 176 matching lines @@
 func (s *lxcProvisionerSuite) SetUpTest(c *gc.C) {
         s.CommonProvisionerSuite.SetUpTest(c)
         s.lxcSuite.SetUpTest(c)
 
         // The lxc provisioner actually needs the machine it is being created on
         // to be in state, in order to get the watcher.
         m, err := s.State.AddMachine(coretesting.FakeDefaultSeries, state.JobHostUnits, state.JobManageEnviron)
         c.Assert(err, gc.IsNil)
         err = m.SetAddresses(instance.NewAddress("0.1.2.3", instance.NetworkUnknown))
         c.Assert(err, gc.IsNil)
+
+        hostPorts := [][]instance.HostPort{{{
+                Address: instance.NewAddress("0.1.2.3", instance.NetworkUnknown),
+                Port:    1234,
+        }}}
+        err = s.State.SetAPIHostPorts(hostPorts)
+        c.Assert(err, gc.IsNil)
+
+        c.Assert(err, gc.IsNil)
         s.parentMachineId = m.Id()
         s.APILogin(c, m)
         err = m.SetAgentVersion(version.Current)
         c.Assert(err, gc.IsNil)
 
         s.events = make(chan mock.Event, 25)
         s.Factory.AddListener(s.events)
 }
 
 func (s *lxcProvisionerSuite) expectStarted(c *gc.C, machine *state.Machine) string {
@@ skipping 91 matching lines @@
 }
 
 type fakeAPI struct{}
 
 func (*fakeAPI) ContainerConfig() (params.ContainerConfig, error) {
         return params.ContainerConfig{
                 ProviderType:            "fake",
                 AuthorizedKeys:          coretesting.FakeAuthKeys,
                 SSLHostnameVerification: true}, nil
 }