1
=== modified file 'environs/jujutest/livetests.go'
2
--- environs/jujutest/livetests.go	2013-09-30 19:40:06 +0000
3
+++ environs/jujutest/livetests.go	2013-10-02 00:16:49 +0000
4
@@ -864,7 +864,7 @@
5
864
	machineConfig := environs.NewMachineConfig(machineId, "", stateInfo, apiInfo)
864
	machineConfig := environs.NewMachineConfig(machineId, "", stateInfo, apiInfo)
6
865
865
7
866
	t.PrepareOnce(c)
866
	t.PrepareOnce(c)
9
867
	possibleTools := envtesting.AssertUploadFakeToolsVersions(c, t.Env.Storage(), version.Current)
867
	possibleTools := envtesting.AssertUploadFakeToolsVersions(c, t.Env.Storage(), version.MustParseBinary("5.4.5-precise-amd64"))
10
868
	inst, _, err := t.Env.StartInstance(constraints.Value{}, possibleTools, machineConfig)
868
	inst, _, err := t.Env.StartInstance(constraints.Value{}, possibleTools, machineConfig)
11
869
	if inst != nil {
869
	if inst != nil {
12
870
		err := t.Env.StopInstances([]instance.Instance{inst})
870
		err := t.Env.StopInstances([]instance.Instance{inst})
13
871
871
14
=== modified file 'upstart/upstart.go'
15
--- upstart/upstart.go	2013-09-29 23:03:55 +0000
16
+++ upstart/upstart.go	2013-10-02 00:16:49 +0000
17
@@ -41,7 +41,7 @@
18
41
41
19
42
// Running returns true if the Service appears to be running.
42
// Running returns true if the Service appears to be running.
20
43
func (s *Service) Running() bool {
43
func (s *Service) Running() bool {
22
44
	cmd := exec.Command("status", s.Name)
44
	cmd := exec.Command("status", "--system", s.Name)
23
45
	out, err := cmd.CombinedOutput()
45
	out, err := cmd.CombinedOutput()
24
46
	if err != nil {
46
	if err != nil {
25
47
		return false
47
		return false
26
@@ -54,7 +54,14 @@
27
54
	if s.Running() {
54
	if s.Running() {
28
55
		return nil
55
		return nil
29
56
	}
56
	}
31
57
	return runCommand("start", "--system", s.Name)
57
	err := runCommand("start", "--system", s.Name)
32
58
	if err != nil {
33
59
		// Double check to see if we were started before our command ran.
34
60
		if s.Running() {
35
61
			return nil
36
62
		}
37
63
	}
38
64
	return err
39
58
}
65
}
40
59
66
41
60
func runCommand(args ...string) error {
67
func runCommand(args ...string) error {
42
61
68
43
=== modified file 'upstart/upstart_test.go'
44
--- upstart/upstart_test.go	2013-09-29 23:12:23 +0000
45
+++ upstart/upstart_test.go	2013-10-02 00:16:49 +0000
46
@@ -41,13 +41,13 @@
47
41
41
48
42
var checkargs = `
42
var checkargs = `
49
43
#!/bin/bash
43
#!/bin/bash
57
44
if [ "$1" == "--system" ]; then
44
if [ "$1" != "--system" ]; then
58
45
  shift
45
  exit 255
59
46
fi
46
fi
60
47
if [ "$1" != "some-service" ]; then
47
if [ "$2" != "some-service" ]; then
61
48
  exit 255
48
  exit 255
62
49
fi
49
fi
63
50
if [ "$2" != "" ]; then
50
if [ "$3" != "" ]; then
64
51
  exit 255
51
  exit 255
65
52
fi
52
fi
66
53
`[1:]
53
`[1:]
Status:	Merged
Approved by:	Tim Penhey on 2013-10-02
Approved revision:	no longer in the source branch.
Merged at revision:	1917
Proposed branch:	lp:~thumper/juju-core/upstart-system
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	66 lines (+17/-10) 3 files modified environs/jujutest/livetests.go (+1/-1) upstart/upstart.go (+9/-2) upstart/upstart_test.go (+7/-7)
To merge this branch:	bzr merge lp:~thumper/juju-core/upstart-system
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-10-01	Pending
Review via email: mp+188739@code.launchpad.net