From cea51641d4dacf24cc53a30144fc14ec053f5aa2 Mon Sep 17 00:00:00 2001
From: Nicolas Lacasse <nlacasse@google.com>
Date: Tue, 16 Oct 2018 20:33:20 -0700
Subject: [PATCH] Bump sandbox start and stop timeouts.

PiperOrigin-RevId: 217433699
Change-Id: Icef08285728c23ee7dd650706aaf18da51c25dff
---
 runsc/container/BUILD        | 2 --
 runsc/container/container.go | 2 +-
 runsc/sandbox/sandbox.go     | 2 +-
 3 files changed, 2 insertions(+), 4 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 {
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index be68e864f..713b326a6 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -86,7 +86,7 @@ func Create(id string, spec *specs.Spec, conf *boot.Config, bundleDir, consoleSo
 	}
 
 	// Wait for the control server to come up (or timeout).
-	if err := s.waitForCreated(10 * time.Second); err != nil {
+	if err := s.waitForCreated(20 * time.Second); err != nil {
 		return nil, err
 	}