← Back to branch summary

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

« back to all changes in this revision

Viewing changes to state/apiserver/api_test.go

state/apiserver: continue factoring out

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/apiserver/api_test.go
1
 
package api_test
 
1
package apiserver_test
2
2
 
3
3
import (
4
4
        "errors"
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
        "launchpad.net/juju-core/state/apiserver"
13
13
        "launchpad.net/juju-core/state/statecmd"
14
14
        coretesting "launchpad.net/juju-core/testing"
15
15
        "net"
29
29
var _ = Suite(&suite{})
30
30
 
31
31
func init() {
32
 
        server.AuthenticationEnabled = true
 
32
        apiserver.AuthenticationEnabled = true
33
33
}
34
34
 
35
35
var operationPermTests = []struct {
670
670
func (s *suite) TestServerStopsOutstandingWatchMethod(c *C) {
671
671
        // Start our own instance of the server so we have
672
672
        // a handle on it to stop it.
673
 
        srv, err := server.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
 
673
        srv, err := apiserver.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
674
674
        c.Assert(err, IsNil)
675
675
 
676
676
        stm, err := s.State.AddMachine("series", state.JobHostUnits)
760
760
        defer st.Close()
761
761
        // By testing this single call, we test that the
762
762
        // error transformation function is correctly called
763
 
        // on error returns from the API server. The transformation
 
763
        // on error returns from the API apiserver. The transformation
764
764
        // function itself is tested below.
765
765
        _, err = st.Machine("99")
766
766
        c.Assert(api.ErrCode(err), Equals, api.CodeNotFound)
788
788
        err:  state.ErrUnitHasSubordinates,
789
789
        code: api.CodeUnitHasSubordinates,
790
790
}, {
791
 
        err:  server.ErrBadId,
 
791
        err:  apiserver.ErrBadId,
792
792
        code: api.CodeNotFound,
793
793
}, {
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,
 
794
        err:  apiserver.ErrBadCreds,
 
795
        code: api.CodeUnauthorized,
 
796
}, {
 
797
        err:  apiserver.ErrPerm,
 
798
        code: api.CodeUnauthorized,
 
799
}, {
 
800
        err:  apiserver.ErrNotLoggedIn,
 
801
        code: api.CodeUnauthorized,
 
802
}, {
 
803
        err:  apiserver.ErrUnknownWatcher,
804
804
        code: api.CodeNotFound,
805
805
}, {
806
806
        err:  &state.NotAssignedError{&state.Unit{}}, // too sleazy?!
807
807
        code: api.CodeNotAssigned,
808
808
}, {
809
 
        err:  server.ErrStoppedWatcher,
 
809
        err:  apiserver.ErrStoppedWatcher,
810
810
        code: api.CodeStopped,
811
811
}, {
812
812
        err:  errors.New("an error"),
815
815
 
816
816
func (s *suite) TestErrorTransform(c *C) {
817
817
        for _, t := range errorTransformTests {
818
 
                err1 := server.ServerError(t.err)
 
818
                err1 := apiserver.ServerError(t.err)
819
819
                c.Assert(err1.Error(), Equals, t.err.Error())
820
820
                if t.code != "" {
821
821
                        c.Assert(api.ErrCode(err1), Equals, t.code)
839
839
func (s *suite) TestStop(c *C) {
840
840
        // Start our own instance of the server so we have
841
841
        // a handle on it to stop it.
842
 
        srv, err := server.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
 
842
        srv, err := apiserver.NewServer(s.State, "localhost:0", []byte(coretesting.ServerCert), []byte(coretesting.ServerKey))
843
843
        c.Assert(err, IsNil)
844
844
 
845
845
        stm, err := s.State.AddMachine("series", state.JobHostUnits)