← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/worker/uniter/uniter_test.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-29 11:40:20 UTC
  • mfrom: (23.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140129114020-ejieitm8smtt5vln
Tags: 1.17.1-0ubuntu2
d/tests/local-provider: Don't fail tests if ~/.juju is present as its
created by the juju version command. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/worker/uniter/uniter_test.go
25
25
 
26
26
        "launchpad.net/juju-core/agent/tools"
27
27
        "launchpad.net/juju-core/charm"
28
 
        "launchpad.net/juju-core/cmd"
29
28
        "launchpad.net/juju-core/errors"
30
29
        "launchpad.net/juju-core/juju/testing"
31
30
        "launchpad.net/juju-core/state"
35
34
        coretesting "launchpad.net/juju-core/testing"
36
35
        jc "launchpad.net/juju-core/testing/checkers"
37
36
        "launchpad.net/juju-core/utils"
 
37
        utilexec "launchpad.net/juju-core/utils/exec"
38
38
        "launchpad.net/juju-core/utils/fslock"
39
39
        "launchpad.net/juju-core/worker"
40
40
        "launchpad.net/juju-core/worker/uniter"
908
908
                verifyRunning{},
909
909
                relationState{life: state.Dying},
910
910
                removeRelationUnit{"mysql/0"},
 
911
                verifyRunning{},
911
912
                relationState{removed: true},
912
913
                verifyRunning{},
913
914
        ), ut(
919
920
                waitHooks{"db-relation-broken db:0"},
920
921
                verifyRunning{},
921
922
                relationState{removed: true},
 
923
                verifyRunning{},
922
924
        ), ut(
923
925
                "service becomes dying while in a relation",
924
926
                quickStartRelation{},
1589
1591
        if s.dirty {
1590
1592
                cmp = gc.Not(gc.Matches)
1591
1593
        }
1592
 
        c.Assert(string(out), cmp, "# On branch master\nnothing to commit.*\n")
 
1594
        c.Assert(string(out), cmp, "(# )?On branch master\nnothing to commit.*\n")
1593
1595
}
1594
1596
 
1595
1597
type startUpgradeError struct{}
1961
1963
                c.Assert(err, gc.IsNil)
1962
1964
                defer client.Close()
1963
1965
 
1964
 
                var result cmd.RemoteResponse
 
1966
                var result utilexec.ExecResponse
1965
1967
                err = client.Call(uniter.JujuRunEndpoint, commands, &result)
1966
1968
                c.Assert(err, gc.IsNil)
1967
1969
                c.Check(result.Code, gc.Equals, 0)