From d2e1b26fb4988227219f2b8b4d9cbf905ceb8a12 Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Fri, 13 Dec 2024 14:30:46 -0800 Subject: [PATCH] fixes all tests --- internal/agent/client_test.go | 2 +- internal/docker/container_store_test.go | 4 ++-- internal/docker/stats_collector_test.go | 2 +- internal/web/actions_test.go | 2 +- internal/web/download_test.go | 2 +- internal/web/events_test.go | 2 +- internal/web/logs_test.go | 14 +++++++------- internal/web/routes_test.go | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/agent/client_test.go b/internal/agent/client_test.go index a3e97e67..fafa7e94 100644 --- a/internal/agent/client_test.go +++ b/internal/agent/client_test.go @@ -92,7 +92,7 @@ func init() { } client = &MockedClient{} - client.On("ListContainers", mock.Anything).Return([]docker.Container{ + client.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ { ID: "123456", Name: "test", diff --git a/internal/docker/container_store_test.go b/internal/docker/container_store_test.go index 1a61e595..c2a9764e 100644 --- a/internal/docker/container_store_test.go +++ b/internal/docker/container_store_test.go @@ -42,7 +42,7 @@ func (m *mockedClient) Host() Host { func TestContainerStore_List(t *testing.T) { client := new(mockedClient) - client.On("ListContainers", mock.Anything).Return([]Container{ + client.On("ListContainers", mock.Anything, mock.Anything).Return([]Container{ { ID: "1234", Name: "test", @@ -74,7 +74,7 @@ func TestContainerStore_List(t *testing.T) { func TestContainerStore_die(t *testing.T) { client := new(mockedClient) - client.On("ListContainers", mock.Anything).Return([]Container{ + client.On("ListContainers", mock.Anything, mock.Anything).Return([]Container{ { ID: "1234", Name: "test", diff --git a/internal/docker/stats_collector_test.go b/internal/docker/stats_collector_test.go index 87601386..47a8ab1d 100644 --- a/internal/docker/stats_collector_test.go +++ b/internal/docker/stats_collector_test.go @@ -10,7 +10,7 @@ import ( func startedCollector(ctx context.Context) *StatsCollector { client := new(mockedClient) - client.On("ListContainers", mock.Anything).Return([]Container{ + client.On("ListContainers", mock.Anything, mock.Anything).Return([]Container{ { ID: "1234", Name: "test", diff --git a/internal/web/actions_test.go b/internal/web/actions_test.go index c3042653..9f980040 100644 --- a/internal/web/actions_test.go +++ b/internal/web/actions_test.go @@ -25,7 +25,7 @@ func mockedClient() *MockedClient { mockedClient.On("ContainerActions", mock.Anything, docker.Start, mock.Anything).Return(errors.New("container not found")) mockedClient.On("ContainerActions", mock.Anything, docker.ContainerAction("something-else"), container.ID).Return(errors.New("unknown action")) mockedClient.On("Host").Return(docker.Host{ID: "localhost"}) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{container}, nil) + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{container}, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.Anything).Return(nil) return mockedClient diff --git a/internal/web/download_test.go b/internal/web/download_test.go index 3dd07f62..b66e1fb7 100644 --- a/internal/web/download_test.go +++ b/internal/web/download_test.go @@ -33,7 +33,7 @@ func Test_handler_download_logs(t *testing.T) { mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil).Run(func(args mock.Arguments) { time.Sleep(1 * time.Second) }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", State: "running"}, }, nil) diff --git a/internal/web/events_test.go b/internal/web/events_test.go index 51f0106a..3e86717f 100644 --- a/internal/web/events_test.go +++ b/internal/web/events_test.go @@ -24,7 +24,7 @@ func Test_handler_streamEvents_happy(t *testing.T) { mockedClient := new(MockedClient) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{}, nil) + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{}, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil).Run(func(args mock.Arguments) { messages := args.Get(1).(chan<- docker.ContainerEvent) diff --git a/internal/web/logs_test.go b/internal/web/logs_test.go index 7cfb3094..5a3a1d8f 100644 --- a/internal/web/logs_test.go +++ b/internal/web/logs_test.go @@ -50,7 +50,7 @@ func Test_handler_streamLogs_happy(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil).Run(func(args mock.Arguments) { @@ -94,7 +94,7 @@ func Test_handler_streamLogs_happy_with_id(t *testing.T) { ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) @@ -133,7 +133,7 @@ func Test_handler_streamLogs_happy_container_stopped(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil) @@ -170,7 +170,7 @@ func Test_handler_streamLogs_error_reading(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil) @@ -193,7 +193,7 @@ func Test_handler_streamLogs_error_std(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil). @@ -235,7 +235,7 @@ func Test_handler_between_dates(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil) @@ -281,7 +281,7 @@ func Test_handler_between_dates_with_fill(t *testing.T) { mockedClient.On("Host").Return(docker.Host{ ID: "localhost", }) - mockedClient.On("ListContainers", mock.Anything).Return([]docker.Container{ + mockedClient.On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{ {ID: id, Name: "test", Host: "localhost", State: "running"}, }, nil) mockedClient.On("ContainerEvents", mock.Anything, mock.AnythingOfType("chan<- docker.ContainerEvent")).Return(nil) diff --git a/internal/web/routes_test.go b/internal/web/routes_test.go index 12822e17..bb23e31c 100644 --- a/internal/web/routes_test.go +++ b/internal/web/routes_test.go @@ -73,7 +73,7 @@ func (m *MockedClient) SystemInfo() system.Info { func createHandler(client docker.Client, content fs.FS, config Config) *chi.Mux { if client == nil { client = new(MockedClient) - client.(*MockedClient).On("ListContainers", mock.Anything).Return([]docker.Container{}, nil) + client.(*MockedClient).On("ListContainers", mock.Anything, mock.Anything).Return([]docker.Container{}, nil) client.(*MockedClient).On("Host").Return(docker.Host{ ID: "localhost", }) @@ -86,7 +86,7 @@ func createHandler(client docker.Client, content fs.FS, config Config) *chi.Mux content = afero.NewIOFS(fs) } - manager := docker_support.NewRetriableClientManager(nil, 3*time.Second, tls.Certificate{}, docker_support.NewDockerClientService(client)) + manager := docker_support.NewRetriableClientManager(nil, 3*time.Second, tls.Certificate{}, docker_support.NewDockerClientService(client, docker.ContainerFilter{})) multiHostService := docker_support.NewMultiHostService(manager, 3*time.Second) return createRouter(&handler{ multiHostService: multiHostService,