Skip to content

Commit

Permalink
unit test rebase mistake fix
Browse files Browse the repository at this point in the history
  • Loading branch information
sparrc committed Apr 21, 2021
1 parent 7d2ecfc commit a6289db
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions agent/app/agent_capability_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ func TestCapabilities(t *testing.T) {
client.EXPECT().ListPluginsWithFilters(gomock.Any(), gomock.Any(), gomock.Any(),
gomock.Any()).AnyTimes().Return([]string{}, nil),
)
cfg := getCapabilitiesTestConfig()
capabilities := getCapabilitiesWithConfig(cfg, t)

expectedNameOnlyCapabilities := []string{
capabilityPrefix + "privileged-container",
Expand Down Expand Up @@ -148,6 +146,21 @@ func TestCapabilities(t *testing.T) {
},
}...)

ctx, cancel := context.WithCancel(context.TODO())
// Cancel the context to cancel async routines
defer cancel()
agent := &ecsAgent{
ctx: ctx,
cfg: conf,
dockerClient: client,
cniClient: cniClient,
pauseLoader: mockPauseLoader,
credentialProvider: aws_credentials.NewCredentials(mockCredentialsProvider),
mobyPlugins: mockMobyPlugins,
}
capabilities, err := agent.capabilities()
assert.NoError(t, err)

for _, expected := range expectedCapabilities {
assert.Contains(t, capabilities, &ecs.Attribute{
Name: expected.Name,
Expand Down Expand Up @@ -1069,6 +1082,8 @@ func TestDefaultPathExistsd(t *testing.T) {
assert.Equal(t, result, tc.expected)
})
}
}

func TestAppendAndRemoveAttributes(t *testing.T) {
attrs := appendNameOnlyAttribute([]*ecs.Attribute{}, "cap-1")
attrs = appendNameOnlyAttribute(attrs, "cap-2")
Expand Down

0 comments on commit a6289db

Please sign in to comment.