← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/cmd/jujud/main_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-24 16:05:44 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20140324160544-g8lsfufby18d5fj4
Tags: 1.17.6-0ubuntu1
https://launchpad.net/bugs/1271144
https://launchpad.net/bugs/1273769
https://launchpad.net/bugs/1248283
https://launchpad.net/bugs/1276909
https://launchpad.net/bugs/1129720
https://launchpad.net/bugs/1240260
* New upstream point release, including fixes for:
  - br0 not bought up by cloud-init with MAAS provider (LP: #1271144).
  - ppc64el enablement for juju/lxc (LP: #1273769).
  - juju userdata should not restart networking (LP: #1248283).
  - error detecting hardware characteristics (LP: #1276909).
  - juju instances not including the default security group (LP: #1129720).
  - juju bootstrap does not honor https_proxy (LP: #1240260).
* d/control,rules: Drop BD on bash-completion, install bash-completion
  direct from upstream source code.
* d/rules: Set HOME prior to generating man pages.
* d/control: Drop alternative dependency on mongodb-server; juju now only
  works on trusty with juju-mongodb.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/cmd/jujud/main_test.go
14
14
        "strings"
15
15
        stdtesting "testing"
16
16
 
 
17
        "github.com/juju/testing"
17
18
        "launchpad.net/gnuflag"
18
19
        gc "launchpad.net/gocheck"
19
20
 
20
21
        "launchpad.net/juju-core/cmd"
21
22
        "launchpad.net/juju-core/environs"
22
 
        "launchpad.net/juju-core/testing"
23
 
        "launchpad.net/juju-core/testing/testbase"
 
23
        coretesting "launchpad.net/juju-core/testing"
24
24
        "launchpad.net/juju-core/worker/deployer"
25
25
        "launchpad.net/juju-core/worker/uniter/jujuc"
26
26
)
52
52
        // Change the default init dir in worker/deployer,
53
53
        // so the deployer doesn't try to remove upstart
54
54
        // jobs from tests.
55
 
        restore := testbase.PatchValue(&deployer.InitDir, mkdtemp("juju-worker-deployer"))
 
55
        restore := testing.PatchValue(&deployer.InitDir, mkdtemp("juju-worker-deployer"))
56
56
        defer restore()
57
57
 
 
58
        // TODO(waigani) 2014-03-19 bug 1294458
 
59
        // Refactor to use base suites
 
60
 
58
61
        // Change the path to "juju-run", so that the
59
62
        // tests don't try to write to /usr/local/bin.
60
63
        jujuRun = mktemp("juju-run", "")
61
64
        defer os.Remove(jujuRun)
62
65
 
63
66
        // Create a CA certificate available for all tests.
64
 
        caCertFile = mktemp("juju-test-cert", testing.CACert)
 
67
        caCertFile = mktemp("juju-test-cert", coretesting.CACert)
65
68
        defer os.Remove(caCertFile)
66
69
 
67
 
        testing.MgoTestPackage(t)
 
70
        coretesting.MgoTestPackage(t)
68
71
}
69
72
 
70
73
type MainSuite struct{}