fixing a few more functional tests

aws · Dec 28, 2018 · 3fc204e · 3fc204e
1 parent 32d3e33
commit 3fc204e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/agent/functional_tests/tests/functionaltests_test.go b/agent/functional_tests/tests/functionaltests_test.go
@@ -564,6 +564,9 @@ func telemetryTest(t *testing.T, taskDefinition string) {
 }
 
 func telemetryTestWithStatsPolling(t *testing.T, taskDefinition string) {
+	// telemetry task requires 2GB of memory (for either linux or windows); requires a bit more to be stable
+	RequireMinimumMemory(t, 2200)
+
 	// Try to let the container use 25% cpu, but bound it within valid range
 	cpuShare, expectedCPUPercentage := calculateCpuLimits(0.25)
 
@@ -944,10 +947,4 @@ func testV3TaskEndpointTags(t *testing.T, taskName, containerName, networkMode s
 
 	exitCode, _ := task.ContainerExitcode(containerName)
 	assert.Equal(t, 42, exitCode, fmt.Sprintf("Expected exit code of 42; got %d", exitCode))
-
-	DeleteAccountSettingInput := ecsapi.DeleteAccountSettingInput{
-		Name: aws.String("containerInstanceLongArnFormat"),
-	}
-	_, err = ECS.DeleteAccountSetting(&DeleteAccountSettingInput)
-	assert.NoError(t, err)
 }
diff --git a/agent/functional_tests/tests/functionaltests_unix_test.go b/agent/functional_tests/tests/functionaltests_unix_test.go
@@ -724,12 +724,6 @@ func TestTaskMetadataValidator(t *testing.T) {
 	exitCode, _ := task.ContainerExitcode("taskmetadata-validator")
 
 	assert.Equal(t, 42, exitCode, fmt.Sprintf("Expected exit code of 42; got %d", exitCode))
-
-	DeleteAccountSettingInput := ecsapi.DeleteAccountSettingInput{
-		Name: aws.String("containerInstanceLongArnFormat"),
-	}
-	_, err = ECS.DeleteAccountSetting(&DeleteAccountSettingInput)
-	assert.NoError(t, err)
 }
 
 // TestExecutionRole verifies that task can use the execution credentials to pull from ECR and