71cecedc44
A call to StopContainer should only return if the client context is canceled or its deadline was exceeded. The Timeout parameter on StopContainerRequest is now used as the time AFTER sending the stop signal before the SIGKILL is delivered. The call will remain until the container has exited or the client context has finished. Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
86 lines
2.3 KiB
Go
86 lines
2.3 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package server
|
|
|
|
import (
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"golang.org/x/net/context"
|
|
|
|
containerstore "github.com/containerd/cri/pkg/store/container"
|
|
)
|
|
|
|
func TestWaitContainerStop(t *testing.T) {
|
|
id := "test-id"
|
|
for desc, test := range map[string]struct {
|
|
status *containerstore.Status
|
|
cancel bool
|
|
timeout time.Duration
|
|
expectErr bool
|
|
}{
|
|
"should return error if timeout exceeds": {
|
|
status: &containerstore.Status{
|
|
CreatedAt: time.Now().UnixNano(),
|
|
StartedAt: time.Now().UnixNano(),
|
|
},
|
|
timeout: 200 * time.Millisecond,
|
|
expectErr: true,
|
|
},
|
|
"should return error if context is cancelled": {
|
|
status: &containerstore.Status{
|
|
CreatedAt: time.Now().UnixNano(),
|
|
StartedAt: time.Now().UnixNano(),
|
|
},
|
|
timeout: time.Hour,
|
|
cancel: true,
|
|
expectErr: true,
|
|
},
|
|
"should not return error if container is stopped before timeout": {
|
|
status: &containerstore.Status{
|
|
CreatedAt: time.Now().UnixNano(),
|
|
StartedAt: time.Now().UnixNano(),
|
|
FinishedAt: time.Now().UnixNano(),
|
|
},
|
|
timeout: time.Hour,
|
|
expectErr: false,
|
|
},
|
|
} {
|
|
c := newTestCRIService()
|
|
container, err := containerstore.NewContainer(
|
|
containerstore.Metadata{ID: id},
|
|
containerstore.WithFakeStatus(*test.status),
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.NoError(t, c.containerStore.Add(container))
|
|
ctx := context.Background()
|
|
if test.cancel {
|
|
cancelledCtx, cancel := context.WithCancel(ctx)
|
|
cancel()
|
|
ctx = cancelledCtx
|
|
}
|
|
if test.timeout > 0 {
|
|
timeoutCtx, cancel := context.WithTimeout(ctx, test.timeout)
|
|
defer cancel()
|
|
ctx = timeoutCtx
|
|
}
|
|
err = c.waitContainerStop(ctx, container)
|
|
assert.Equal(t, test.expectErr, err != nil, desc)
|
|
}
|
|
}
|