Fix unit tests for containerID/containerName changes

aws · Sep 3, 2020 · e865e9c · e865e9c
1 parent ab0e1cb
commit e865e9c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/agent/engine/docker_task_engine_linux_test.go b/agent/engine/docker_task_engine_linux_test.go
@@ -402,7 +402,7 @@ func TestTaskCPULimitHappyPath(t *testing.T) {
 			// Expect a bunch of steady state 'poll' describes when we trigger cleanup
 			client.EXPECT().RemoveContainer(gomock.Any(), gomock.Any(), gomock.Any()).Do(
 				func(ctx interface{}, removedContainerName string, timeout time.Duration) {
-					assert.Equal(t, getCreatedContainerName(), removedContainerName,
+					assert.Equal(t, containerID, removedContainerName,
 						"Container name mismatch")
 				}).Return(nil)
 

diff --git a/agent/engine/docker_task_engine_test.go b/agent/engine/docker_task_engine_test.go
@@ -287,7 +287,7 @@ func TestBatchContainerHappyPath(t *testing.T) {
 			// Expect a bunch of steady state 'poll' describes when we trigger cleanup
 			client.EXPECT().RemoveContainer(gomock.Any(), gomock.Any(), gomock.Any()).Do(
 				func(ctx interface{}, removedContainerName string, timeout time.Duration) {
-					assert.Equal(t, getCreatedContainerName(), removedContainerName,
+					assert.Equal(t, containerID, removedContainerName,
 						"Container name mismatch")
 				}).Return(nil)
 
@@ -494,7 +494,7 @@ func TestRemoveEvents(t *testing.T) {
 
 	client.EXPECT().RemoveContainer(gomock.Any(), gomock.Any(), gomock.Any()).Do(
 		func(ctx interface{}, removedContainerName string, timeout time.Duration) {
-			assert.Equal(t, getCreatedContainerName(), removedContainerName,
+			assert.Equal(t, containerID, removedContainerName,
 				"Container name mismatch")
 
 			// Emit a couple of events for the task before cleanup finishes. This forces
@@ -634,7 +634,7 @@ func TestSteadyStatePoll(t *testing.T) {
 	cleanup := make(chan time.Time)
 	defer close(cleanup)
 	testTime.EXPECT().After(gomock.Any()).Return(cleanup).MinTimes(1)
-	client.EXPECT().RemoveContainer(gomock.Any(), dockerContainer.DockerName, dockerclient.RemoveContainerTimeout).Return(nil)
+	client.EXPECT().RemoveContainer(gomock.Any(), dockerContainer.DockerID, dockerclient.RemoveContainerTimeout).Return(nil)
 	imageManager.EXPECT().RemoveContainerReferenceFromImageState(gomock.Any()).Return(nil)
 
 	waitForStopEvents(t, taskEngine.StateChangeEvents(), false)
@@ -1259,7 +1259,7 @@ func TestProvisionContainerResources(t *testing.T) {
 	}, testTask)
 
 	gomock.InOrder(
-		dockerClient.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).Return(&types.ContainerJSON{
+		dockerClient.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).Return(&types.ContainerJSON{
 			ContainerJSONBase: &types.ContainerJSONBase{
 				ID:    containerID,
 				State: &types.ContainerState{Pid: containerPid},
@@ -1298,7 +1298,7 @@ func TestProvisionContainerResourcesInspectError(t *testing.T) {
 		Container:  pauseContainer,
 	}, testTask)
 
-	dockerClient.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).Return(nil, errors.New("test error"))
+	dockerClient.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).Return(nil, errors.New("test error"))
 
 	assert.NotNil(t, taskEngine.(*DockerTaskEngine).provisionContainerResources(testTask, pauseContainer).Error)
 }
@@ -1353,7 +1353,7 @@ func TestStopPauseContainerCleanupCalled(t *testing.T) {
 	}, testTask)
 
 	gomock.InOrder(
-		dockerClient.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).Return(&types.ContainerJSON{
+		dockerClient.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).Return(&types.ContainerJSON{
 			ContainerJSONBase: &types.ContainerJSONBase{
 				ID:    containerID,
 				State: &types.ContainerState{Pid: containerPid},
@@ -1416,7 +1416,7 @@ func TestStopPauseContainerCleanupDelay(t *testing.T) {
 	}, testTask)
 
 	gomock.InOrder(
-		dockerClient.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).Return(&types.ContainerJSON{
+		dockerClient.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).Return(&types.ContainerJSON{
 			ContainerJSONBase: &types.ContainerJSONBase{
 				ID:    containerID,
 				State: &types.ContainerState{Pid: containerPid},
@@ -1478,7 +1478,7 @@ func TestCreateContainerOnAgentRestart(t *testing.T) {
 	sleepTask := testdata.LoadTask("sleep5")
 	sleepContainer, _ := sleepTask.ContainerByName("sleep5")
 	// Store the generated container name to state
-	state.AddContainer(&apicontainer.DockerContainer{DockerName: "docker_container_name", Container: sleepContainer}, sleepTask)
+	state.AddContainer(&apicontainer.DockerContainer{DockerID: "dockerID", DockerName: "docker_container_name", Container: sleepContainer}, sleepTask)
 
 	gomock.InOrder(
 		client.EXPECT().APIVersion().Return(defaultDockerClientAPIVersion, nil),
@@ -3006,7 +3006,7 @@ func TestGetBridgeIP(t *testing.T) {
 
 func TestStartFirelensContainerRetryForContainerIP(t *testing.T) {
 	dockerMetaDataWithoutNetworkSettings := dockerapi.DockerContainerMetadata{
-		DockerID: dockerContainerName,
+		DockerID: containerID,
 		Volumes: []types.MountPoint{
 			{
 				Name:        "volume",
@@ -3080,17 +3080,18 @@ func TestStartFirelensContainerRetryForContainerIP(t *testing.T) {
 	taskEngine.(*DockerTaskEngine).state.AddTask(testTask)
 	taskEngine.(*DockerTaskEngine).state.AddContainer(&apicontainer.DockerContainer{
 		Container:  testTask.Containers[1],
-		DockerName: "dockerContainerName",
+		DockerName: dockerContainerName,
+		DockerID:   containerID,
 	}, testTask)
 
 	client.EXPECT().APIVersion().Return(defaultDockerClientAPIVersion, nil).AnyTimes()
 	client.EXPECT().StartContainer(gomock.Any(), gomock.Any(), gomock.Any()).Return(dockerMetaDataWithoutNetworkSettings).AnyTimes()
 	gomock.InOrder(
-		client.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).
+		client.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).
 			Return(jsonBaseWithoutNetwork, nil),
-		client.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).
+		client.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).
 			Return(jsonBaseWithoutNetwork, nil),
-		client.EXPECT().InspectContainer(gomock.Any(), dockerContainerName, gomock.Any()).
+		client.EXPECT().InspectContainer(gomock.Any(), containerID, gomock.Any()).
 			Return(jsonBaseWithNetwork, nil),
 	)
 	ret := taskEngine.(*DockerTaskEngine).startContainer(testTask, testTask.Containers[1])