~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/state/address_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
        jc "github.com/juju/testing/checkers"
8
8
        gc "gopkg.in/check.v1"
9
9
 
10
 
        "github.com/juju/juju/juju/testing"
11
10
        "github.com/juju/juju/network"
12
11
        "github.com/juju/juju/state"
13
12
        "github.com/juju/juju/testing/factory"
40
39
}
41
40
 
42
41
type ControllerAddressesSuite struct {
43
 
        testing.JujuConnSuite
 
42
        ConnSuite
44
43
}
45
44
 
46
45
var _ = gc.Suite(&ControllerAddressesSuite{})
47
46
 
48
47
func (s *ControllerAddressesSuite) SetUpTest(c *gc.C) {
49
 
        s.JujuConnSuite.SetUpTest(c)
 
48
        s.ConnSuite.SetUpTest(c)
50
49
        // Make sure there is a machine with manage state in existence.
51
50
        machine := s.Factory.MakeMachine(c, &factory.MachineParams{
52
51
                Jobs: []state.MachineJob{state.JobManageModel, state.JobHostUnits},