mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Make test work with rootless mode
Using `d.Kill()` with rootless mode causes the restarted daemon to not be able to start containerd (it times out). Originally this was SIGKILLing the daemon because we were hoping to not have to manipulate on disk state, but since we need to anyway we can shut it down normally. I also tested this to ensure the test fails correctly without the fix that the test was added to check for. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
parent
8891c58a43
commit
e6591a9c7a
1 changed files with 2 additions and 3 deletions
|
@ -193,7 +193,7 @@ func TestRestartDaemonWithRestartingContainer(t *testing.T) {
|
|||
defer d.Cleanup(t)
|
||||
|
||||
d.StartWithBusybox(t, "--iptables=false")
|
||||
defer d.Kill()
|
||||
defer d.Stop(t)
|
||||
|
||||
ctx := context.Background()
|
||||
client := d.NewClientT(t)
|
||||
|
@ -203,8 +203,7 @@ func TestRestartDaemonWithRestartingContainer(t *testing.T) {
|
|||
// We will manipulate the on disk state later
|
||||
id := container.Create(ctx, t, client, container.WithRestartPolicy("always"), container.WithCmd("/bin/sh", "-c", "exit 1"))
|
||||
|
||||
// SIGKILL the daemon
|
||||
assert.NilError(t, d.Kill())
|
||||
d.Stop(t)
|
||||
|
||||
configPath := filepath.Join(d.Root, "containers", id, "config.v2.json")
|
||||
configBytes, err := ioutil.ReadFile(configPath)
|
||||
|
|
Loading…
Reference in a new issue