Adding Integ Tests for Granular Stop Timeout

agent/engine/ordering_integ_test.go

@@ -75,7 +75,6 @@ func TestDependencyHealthCheck(t *testing.T) {
 	}()
 
 	waitFinished(t, finished, orderingTimeout)
-
 }
 
 // TestDependencyComplete validates that the COMPLETE dependency condition will resolve when the child container exits
@@ -93,7 +92,7 @@ func TestDependencyComplete(t *testing.T) {
 	dependency := createTestContainerWithImageAndName(baseImageForOS, "dependency")
 
 	parent.EntryPoint = &entryPointForOS
-	parent.Command = []string{"sleep 5 && exit 0"}
+	parent.Command = []string{"sleep 5"}
 	parent.DependsOn = []apicontainer.DependsOn{
 		{
 			Container: "dependency",
@@ -155,7 +154,7 @@ func TestDependencySuccess(t *testing.T) {
 	}
 
 	dependency.EntryPoint = &entryPointForOS
-	dependency.Command = []string{"sleep 10 && exit 0"}
+	dependency.Command = []string{"sleep 10"}
 	dependency.Essential = false
 
 	testTask.Containers = []*apicontainer.Container{
@@ -255,7 +254,7 @@ func TestDependencySuccessTimeout(t *testing.T) {
 	}
 
 	dependency.EntryPoint = &entryPointForOS
-	dependency.Command = []string{"sleep 15 && exit 0"}
+	dependency.Command = []string{"sleep 15"}
 	dependency.Essential = false
 
 	// set the timeout to be shorter than the amount of time it takes to stop
@@ -339,6 +338,7 @@ func TestDependencyHealthyTimeout(t *testing.T) {
 	waitFinished(t, finished, orderingTimeout)
 }
 
+
 func waitFinished(t *testing.T, finished <-chan interface{}, duration time.Duration) {
 	select {
 	case <-finished:

agent/engine/ordering_integ_unix_test.go

@@ -15,10 +15,84 @@
 
 package engine
 
+import (
+	"testing"
+
+	apicontainer "github.com/aws/amazon-ecs-agent/agent/api/container"
+	"github.com/stretchr/testify/assert"
+)
+
 const (
 	baseImageForOS = testRegistryHost + "/" + "busybox"
 )
 
 var (
 	entryPointForOS = []string{"sh", "-c"}
 )
+
+func TestGranularStopTimeout(t *testing.T) {
+	taskEngine, done, _ := setupWithDefaultConfig(t)
+	defer done()
+
+	stateChangeEvents := taskEngine.StateChangeEvents()
+
+	taskArn := "TestGranularStopTimeout"
+	testTask := createTestTask(taskArn)
+
+	parent := createTestContainerWithImageAndName(baseImageForOS, "parent")
+	dependency1 := createTestContainerWithImageAndName(baseImageForOS, "dependency1")
+	dependency2 := createTestContainerWithImageAndName(baseImageForOS, "dependency2")
+
+	parent.EntryPoint = &entryPointForOS
+	parent.Command = []string{"sleep 30"}
+	parent.Essential = true
+	parent.DependsOn = []apicontainer.DependsOn{
+		{
+			Container: "dependency1",
+			Condition: "START",
+		},
+		{
+			Container: "dependency2",
+			Condition: "START",
+		},
+	}
+
+	dependency1.EntryPoint = &entryPointForOS
+	dependency1.Command = []string{"trap 'echo caught' SIGTERM; sleep 60"}
+	dependency1.StopTimeout = 5
+
+	dependency2.EntryPoint = &entryPointForOS
+	dependency2.Command = []string{"trap 'echo caught' SIGTERM; sleep 60"}
+	dependency2.StopTimeout = 50
+
+	testTask.Containers = []*apicontainer.Container{
+		dependency1,
+		dependency2,
+		parent,
+	}
+
+	go taskEngine.AddTask(testTask)
+
+	finished := make(chan interface{})
+	go func() {
+
+		verifyContainerRunningStateChange(t, taskEngine)
+		verifyContainerRunningStateChange(t, taskEngine)
+		verifyContainerRunningStateChange(t, taskEngine)
+
+		verifyTaskIsRunning(stateChangeEvents, testTask)
+
+		verifyContainerStoppedStateChange(t, taskEngine)
+		verifyContainerStoppedStateChange(t, taskEngine)
+		verifyContainerStoppedStateChange(t, taskEngine)
+
+		verifyTaskIsStopped(stateChangeEvents, testTask)
+
+		assert.Equal(t, 137, *testTask.Containers[0].GetKnownExitCode(), "Dependency1 should exit with code 137")
+		assert.Equal(t, 0, *testTask.Containers[1].GetKnownExitCode(), "Dependency2 should exit with code 0")
+
+		close(finished)
+	}()
+
+	waitFinished(t, finished, orderingTimeout)
+}