~ubuntu-branches/ubuntu/trusty/juju-core/trusty-proposed

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/featuretests/leadership_test.go

  • Committer: Package Import Robot
  • Author(s): Robie Basak
  • Date: 2015-07-15 13:09:07 UTC
  • mfrom: (35.1.15 wily-proposed)
  • Revision ID: package-import@ubuntu.com-20150715130907-wqak1zpebzzdvy3q
Tags: 1.22.6-0ubuntu1~14.04.1
* No change backport to 14.04 (LP: #1469744). This results in the
  following packaging delta from the previous 1.20.11-0ubuntu0.14.04.1
  in trusty-updates:
  - distro-info added and libgo5 removed from Build-Depends.
  - Standards-Version bumped.
  - cloud-image-utils | cloud-utils added to juju-local Depends.
  - d/copyright updated.
  - dep8 tests updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
94
94
        )
95
95
 
96
96
        // Create & start a machine agent so the tests have something to call into.
97
 
        agentConf := agentcmd.AgentConf{DataDir: s.DataDir()}
98
 
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(&agentConf, &agentConf)
 
97
        agentConf := agentcmd.NewAgentConf(s.DataDir())
 
98
        machineAgentFactory := agentcmd.MachineAgentFactoryFn(agentConf, agentConf)
99
99
        s.machineAgent = machineAgentFactory(stateServer.Id())
100
100
 
101
101
        c.Log("Starting machine agent...")