Delete tasks and snapshots explicitly

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

runtime/service_integ_test.go

@@ -546,6 +546,7 @@ func startAndWaitTask(ctx context.Context, t *testing.T, c containerd.Container)
 
 	err = task.Start(ctx)
 	require.NoError(t, err, "failed to start task for container %s", c.ID())
+	defer task.Delete(ctx)
 
 	select {
 	case exitStatus := <-exitCh:
@@ -613,7 +614,7 @@ func TestRemoveDir_Isolated(t *testing.T) {
 	)
 	require.NoError(t, err, "failed to create container %s", containerName)
 	require.Equal(t, "hello\n", startAndWaitTask(ctx, t, c1))
-	require.NoError(t, c1.Delete(ctx))
+	require.NoError(t, c1.Delete(ctx, containerd.WithSnapshotCleanup))
 
 	c2, err := client.NewContainer(ctx,
 		containerName,
@@ -626,5 +627,5 @@ func TestRemoveDir_Isolated(t *testing.T) {
 	)
 	require.NoError(t, err, "failed to create container %s", containerName)
 	require.Equal(t, "hello\n", startAndWaitTask(ctx, t, c2))
-	require.NoError(t, c2.Delete(ctx))
+	require.NoError(t, c2.Delete(ctx, containerd.WithSnapshotCleanup))
 }