1 Star 0 Fork 58

gnaygnil/docker

forked from src-openEuler/docker 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
0072-pause-fix-test-can-not-stop-paused-container-.patch 1.42 KB
一键复制 编辑 原始数据 按行查看 历史
gnaygnil 提交于 2020-02-13 15:36 . docker: Fixed build error and URL
From 59d4dd7fdb0c33dc4c3be2330606ec7724cb368c Mon Sep 17 00:00:00 2001
From: jingrui <jingrui@huawei.com>
Date: Fri, 11 Jan 2019 17:16:21 +0800
Subject: [PATCH 072/111] pause: fix test can not stop paused
container failed
reason: pause function moved to docker and does not support stop paused
container. return error message when stop a paused container.
Change-Id: Ia7b15877980088cdb4eaf9f7e3dd86667df0157b
Signed-off-by: jingrui <jingrui@huawei.com>
---
components/engine/integration/container/pause_test.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/engine/integration/container/pause_test.go b/components/engine/integration/container/pause_test.go
index 8dd2d784b7..da274c89ce 100644
--- a/components/engine/integration/container/pause_test.go
+++ b/components/engine/integration/container/pause_test.go
@@ -79,9 +79,10 @@ func TestPauseStopPausedContainer(t *testing.T) {
assert.NilError(t, err)
err = client.ContainerStop(ctx, cID, nil)
- assert.NilError(t, err)
-
- poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))
+ // assert.NilError(t, err)
+ // poll.WaitOn(t, container.IsStopped(ctx, client, cID), poll.WithDelay(100*time.Millisecond))
+ assert.Check(t, is.ErrorContains(err, "is paused"))
+ client.ContainerUnpause(ctx, cID)
}
func getEventActions(t *testing.T, messages <-chan events.Message, errs <-chan error) []string {
--
2.17.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/gnaygnil/docker.git
git@gitee.com:gnaygnil/docker.git
gnaygnil
docker
docker
master

搜索帮助