Skip to content

Commit

Permalink
Merge pull request #39 from mozhuli/enhance-fake-services
Browse files Browse the repository at this point in the history 
Enhance fake services
  • Loading branch information
@Random-Liu
Random-Liu committed May 17, 2017
2 parents a397b69 + 938cbe3 commit dea7ed3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 28 deletions.
39 changes: 18 additions & 21 deletions pkg/server/testing/fake_execution_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/api/services/execution"
"github.com/containerd/containerd/api/types/container"
google_protobuf "github.com/golang/protobuf/ptypes/empty"
googleprotobuf "github.com/golang/protobuf/ptypes/empty"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand Down Expand Up @@ -91,10 +91,7 @@ func (f *FakeExecutionClient) WithEvents() *FakeExecutionClient {
return f
}

func (f *FakeExecutionClient) popError(op string) error {
if f.errors == nil {
return nil
}
func (f *FakeExecutionClient) getError(op string) error {
err, ok := f.errors[op]
if ok {
delete(f.errors, op)
Expand Down Expand Up @@ -176,7 +173,7 @@ func (f *FakeExecutionClient) Create(ctx context.Context, createOpts *execution.
f.Lock()
defer f.Unlock()
f.appendCalled("create", createOpts)
if err := f.popError("create"); err != nil {
if err := f.getError("create"); err != nil {
return nil, err
}
_, ok := f.ContainerList[createOpts.ID]
Expand All @@ -201,11 +198,11 @@ func (f *FakeExecutionClient) Create(ctx context.Context, createOpts *execution.
}

// Start is a test implementation of execution.Start
func (f *FakeExecutionClient) Start(ctx context.Context, startOpts *execution.StartRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
func (f *FakeExecutionClient) Start(ctx context.Context, startOpts *execution.StartRequest, opts ...grpc.CallOption) (*googleprotobuf.Empty, error) {
f.Lock()
defer f.Unlock()
f.appendCalled("start", startOpts)
if err := f.popError("start"); err != nil {
if err := f.getError("start"); err != nil {
return nil, err
}
c, ok := f.ContainerList[startOpts.ID]
Expand All @@ -221,13 +218,13 @@ func (f *FakeExecutionClient) Start(ctx context.Context, startOpts *execution.St
case container.Status_CREATED:
c.Status = container.Status_RUNNING
f.ContainerList[startOpts.ID] = c
return &google_protobuf.Empty{}, nil
return &googleprotobuf.Empty{}, nil
case container.Status_STOPPED:
return &google_protobuf.Empty{}, fmt.Errorf("cannot start a container that has stopped")
return &googleprotobuf.Empty{}, fmt.Errorf("cannot start a container that has stopped")
case container.Status_RUNNING:
return &google_protobuf.Empty{}, fmt.Errorf("cannot start an already running container")
return &googleprotobuf.Empty{}, fmt.Errorf("cannot start an already running container")
default:
return &google_protobuf.Empty{}, fmt.Errorf("cannot start a container in the %s state", c.Status)
return &googleprotobuf.Empty{}, fmt.Errorf("cannot start a container in the %s state", c.Status)
}
}

Expand All @@ -236,7 +233,7 @@ func (f *FakeExecutionClient) Delete(ctx context.Context, deleteOpts *execution.
f.Lock()
defer f.Unlock()
f.appendCalled("delete", deleteOpts)
if err := f.popError("delete"); err != nil {
if err := f.getError("delete"); err != nil {
return nil, err
}
c, ok := f.ContainerList[deleteOpts.ID]
Expand All @@ -257,7 +254,7 @@ func (f *FakeExecutionClient) Info(ctx context.Context, infoOpts *execution.Info
f.Lock()
defer f.Unlock()
f.appendCalled("info", infoOpts)
if err := f.popError("info"); err != nil {
if err := f.getError("info"); err != nil {
return nil, err
}
c, ok := f.ContainerList[infoOpts.ID]
Expand All @@ -272,7 +269,7 @@ func (f *FakeExecutionClient) List(ctx context.Context, listOpts *execution.List
f.Lock()
defer f.Unlock()
f.appendCalled("list", listOpts)
if err := f.popError("list"); err != nil {
if err := f.getError("list"); err != nil {
return nil, err
}
resp := &execution.ListResponse{}
Expand All @@ -287,11 +284,11 @@ func (f *FakeExecutionClient) List(ctx context.Context, listOpts *execution.List
}

// Kill is a test implementation of execution.Kill
func (f *FakeExecutionClient) Kill(ctx context.Context, killOpts *execution.KillRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
func (f *FakeExecutionClient) Kill(ctx context.Context, killOpts *execution.KillRequest, opts ...grpc.CallOption) (*googleprotobuf.Empty, error) {
f.Lock()
defer f.Unlock()
f.appendCalled("kill", killOpts)
if err := f.popError("kill"); err != nil {
if err := f.getError("kill"); err != nil {
return nil, err
}
c, ok := f.ContainerList[killOpts.ID]
Expand All @@ -305,15 +302,15 @@ func (f *FakeExecutionClient) Kill(ctx context.Context, killOpts *execution.Kill
Type: container.Event_EXIT,
Pid: c.Pid,
})
return &google_protobuf.Empty{}, nil
return &googleprotobuf.Empty{}, nil
}

// Events is a test implementation of execution.Events
func (f *FakeExecutionClient) Events(ctx context.Context, eventsOpts *execution.EventsRequest, opts ...grpc.CallOption) (execution.ContainerService_EventsClient, error) {
f.Lock()
defer f.Unlock()
f.appendCalled("events", eventsOpts)
if err := f.popError("events"); err != nil {
if err := f.getError("events"); err != nil {
return nil, err
}
var client = &EventClient{
Expand All @@ -330,13 +327,13 @@ func (f *FakeExecutionClient) Exec(ctx context.Context, execOpts *execution.Exec
}

// Pty is a test implementation of execution.Pty
func (f *FakeExecutionClient) Pty(ctx context.Context, ptyOpts *execution.PtyRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
func (f *FakeExecutionClient) Pty(ctx context.Context, ptyOpts *execution.PtyRequest, opts ...grpc.CallOption) (*googleprotobuf.Empty, error) {
// TODO: implement Pty()
return nil, nil
}

// CloseStdin is a test implementation of execution.CloseStdin
func (f *FakeExecutionClient) CloseStdin(ctx context.Context, closeStdinOpts *execution.CloseStdinRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
func (f *FakeExecutionClient) CloseStdin(ctx context.Context, closeStdinOpts *execution.CloseStdinRequest, opts ...grpc.CallOption) (*googleprotobuf.Empty, error) {
// TODO: implement CloseStdin()
return nil, nil
}
11 changes: 4 additions & 7 deletions pkg/server/testing/fake_rootfs_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ func NewFakeRootfsClient() *FakeRootfsClient {
}
}

func (f *FakeRootfsClient) popError(op string) error {
if f.errors == nil {
return nil
}
func (f *FakeRootfsClient) getError(op string) error {
err, ok := f.errors[op]
if ok {
delete(f.errors, op)
Expand Down Expand Up @@ -142,7 +139,7 @@ func (f *FakeRootfsClient) Unpack(ctx context.Context, unpackOpts *rootfs.Unpack
f.Lock()
defer f.Unlock()
f.appendCalled("unpack", unpackOpts)
if err := f.popError("unpack"); err != nil {
if err := f.getError("unpack"); err != nil {
return nil, err
}
chainID := generateChainID(unpackOpts.Layers)
Expand All @@ -161,7 +158,7 @@ func (f *FakeRootfsClient) Prepare(ctx context.Context, prepareOpts *rootfs.Prep
f.Lock()
defer f.Unlock()
f.appendCalled("prepare", prepareOpts)
if err := f.popError("prepare"); err != nil {
if err := f.getError("prepare"); err != nil {
return nil, err
}
_, ok := f.ChainIDList[prepareOpts.ChainID]
Expand All @@ -183,7 +180,7 @@ func (f *FakeRootfsClient) Mounts(ctx context.Context, mountsOpts *rootfs.Mounts
f.Lock()
defer f.Unlock()
f.appendCalled("mounts", mountsOpts)
if err := f.popError("mounts"); err != nil {
if err := f.getError("mounts"); err != nil {
return nil, err
}
mounts, ok := f.MountList[mountsOpts.Name]
Expand Down

0 comments on commit dea7ed3

Please sign in to comment.