Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing a few more functional tests #1767

Merged
merged 1 commit into from
Dec 31, 2018
Merged

Fixing a few more functional tests #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions agent/functional_tests/tests/functionaltests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
}
6 changes: 0 additions & 6 deletions agent/functional_tests/tests/functionaltests_unix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down