From 356da56bb8a4485d965acfe7390d9f087205e7d4 Mon Sep 17 00:00:00 2001 From: fenxiong Date: Mon, 24 Dec 2018 15:36:04 -0800 Subject: [PATCH] fixing a few more functional tests --- agent/functional_tests/tests/functionaltests_test.go | 9 +++------ .../functional_tests/tests/functionaltests_unix_test.go | 6 ------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/agent/functional_tests/tests/functionaltests_test.go b/agent/functional_tests/tests/functionaltests_test.go index c1e893de2b6..b6ca7399733 100644 --- 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 index 1d123d7912c..170df98bb19 100644 --- 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