~rogpeppe/juju-core/axwalk-lp1300889-disable-mongo-keyfile

« back to all changes in this revision

Viewing changes to provider/azure/customdata_test.go

  • Committer: Jesse Meek
  • Date: 2014-03-07 23:03:04 UTC
  • mfrom: (2394 juju-core)
  • mto: This revision was merged to the branch mainline in revision 2433.
  • Revision ID: jesse.meek@canonical.com-20140307230304-k6rkxj7jps31am0q
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
 
9
9
        gc "launchpad.net/gocheck"
10
10
 
 
11
        "launchpad.net/juju-core/agent"
11
12
        "launchpad.net/juju-core/environs"
12
13
        "launchpad.net/juju-core/environs/cloudinit"
13
14
        "launchpad.net/juju-core/names"
14
15
        "launchpad.net/juju-core/state"
15
16
        "launchpad.net/juju-core/state/api"
 
17
        "launchpad.net/juju-core/state/api/params"
16
18
        "launchpad.net/juju-core/testing"
17
19
        "launchpad.net/juju-core/testing/testbase"
18
20
        "launchpad.net/juju-core/tools"
31
33
                MachineId:          machineID,
32
34
                MachineNonce:       "gxshasqlnng",
33
35
                DataDir:            environs.DataDir,
34
 
                LogDir:             environs.LogDir,
 
36
                LogDir:             agent.DefaultLogDir,
 
37
                Jobs:               []params.MachineJob{params.JobManageEnviron, params.JobHostUnits},
35
38
                CloudInitOutputLog: environs.CloudInitOutputLog,
36
39
                Tools:              &tools.Tools{URL: "file://" + c.MkDir()},
37
40
                StateInfo: &state.Info{