summaryrefslogtreecommitdiffhomepage
path: root/runsc/container
diff options
context:
space:
mode:
Diffstat (limited to 'runsc/container')
-rw-r--r--runsc/container/BUILD2
-rw-r--r--runsc/container/container.go2
2 files changed, 1 insertions, 3 deletions
diff --git a/runsc/container/BUILD b/runsc/container/BUILD
index bf8b9a2ab..60f1d3033 100644
--- a/runsc/container/BUILD
+++ b/runsc/container/BUILD
@@ -40,8 +40,6 @@ go_test(
],
embed = [":container"],
tags = [
- # FIXME
- "flaky",
"requires-kvm",
],
deps = [
diff --git a/runsc/container/container.go b/runsc/container/container.go
index 37e607bed..774cb6e07 100644
--- a/runsc/container/container.go
+++ b/runsc/container/container.go
@@ -658,7 +658,7 @@ func (c *Container) stop() error {
}
func (c *Container) waitForStopped() error {
- ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
b := backoff.WithContext(backoff.NewConstantBackOff(100*time.Millisecond), ctx)
op := func() error {