← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to state/api/api_test.go

Sequestering server.

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/api/api_test.go
9
9
        "launchpad.net/juju-core/rpc"
10
10
        "launchpad.net/juju-core/state"
11
11
        "launchpad.net/juju-core/state/api"
 
12
        "launchpad.net/juju-core/state/api/server"
12
13
        "launchpad.net/juju-core/state/statecmd"
13
14
        coretesting "launchpad.net/juju-core/testing"
14
15
        "net"
28
29
var _ = Suite(&suite{})
29
30
 
30
31
func init() {
31
 
        api.AuthenticationEnabled = true
 
32
        server.AuthenticationEnabled = true
32
33
}
33
34
 
34
35
var operationPermTests = []struct {
669
670
func (s *suite) TestServerStopsOutstandingWatchMethod(c *C) {
670
671
        // Start our own instance of the server so we have
671
672
        // a handle on it to stop it.
672
 
        srv, err := api.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
 
673
        srv, err := server.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
673
674
        c.Assert(err, IsNil)
674
675
 
675
676
        stm, err := s.State.AddMachine("series", state.JobHostUnits)
787
788
        err:  state.ErrUnitHasSubordinates,
788
789
        code: api.CodeUnitHasSubordinates,
789
790
}, {
790
 
        err:  api.ErrBadId,
 
791
        err:  server.ErrBadId,
791
792
        code: api.CodeNotFound,
792
793
}, {
793
 
        err:  api.ErrBadCreds,
794
 
        code: api.CodeUnauthorized,
795
 
}, {
796
 
        err:  api.ErrPerm,
797
 
        code: api.CodeUnauthorized,
798
 
}, {
799
 
        err:  api.ErrNotLoggedIn,
800
 
        code: api.CodeUnauthorized,
801
 
}, {
802
 
        err:  api.ErrUnknownWatcher,
 
794
        err:  server.ErrBadCreds,
 
795
        code: api.CodeUnauthorized,
 
796
}, {
 
797
        err:  server.ErrPerm,
 
798
        code: api.CodeUnauthorized,
 
799
}, {
 
800
        err:  server.ErrNotLoggedIn,
 
801
        code: api.CodeUnauthorized,
 
802
}, {
 
803
        err:  server.ErrUnknownWatcher,
803
804
        code: api.CodeNotFound,
804
805
}, {
805
806
        err:  &state.NotAssignedError{&state.Unit{}}, // too sleazy?!
806
807
        code: api.CodeNotAssigned,
807
808
}, {
808
 
        err:  api.ErrStoppedWatcher,
 
809
        err:  server.ErrStoppedWatcher,
809
810
        code: api.CodeStopped,
810
811
}, {
811
812
        err:  errors.New("an error"),
814
815
 
815
816
func (s *suite) TestErrorTransform(c *C) {
816
817
        for _, t := range errorTransformTests {
817
 
                err1 := api.ServerError(t.err)
 
818
                err1 := server.ServerError(t.err)
818
819
                c.Assert(err1.Error(), Equals, t.err.Error())
819
820
                if t.code != "" {
820
821
                        c.Assert(api.ErrCode(err1), Equals, t.code)
838
839
func (s *suite) TestStop(c *C) {
839
840
        // Start our own instance of the server so we have
840
841
        // a handle on it to stop it.
841
 
        srv, err := api.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
 
842
        srv, err := server.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
842
843
        c.Assert(err, IsNil)
843
844
 
844
845
        stm, err := s.State.AddMachine("series", state.JobHostUnits)