Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +02:00
Code Issues Releases Activity

chore(unit-test): simplify teardown EE-5536 (#9015)

Browse source
This commit is contained in:
andres-portainer 2023-05-30 11:02:22 -03:00 • committed by GitHub
parent b498cd657f
commit eda07614ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 110 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/http/handler/endpoints/endpoint_delete_test.go
View file

@ -19,8 +19,7 @@ import (
func TestEndpointDeleteEdgeGroupsConcurrently(t *testing.T) {
const endpointsCount = 100
_, store, teardown := datastore.MustNewTestStore(t, true, false)
defer teardown()
_, store := datastore.MustNewTestStore(t, true, false)
user := &portainer.User{ID: 2, Username: "admin", Role: portainer.AdministratorRole}
err := store.User().Create(user)

19
api/http/handler/endpoints/endpoint_list_test.go
View file

@ -22,7 +22,6 @@ type endpointListTest struct {
}
func Test_EndpointList_AgentVersion(t *testing.T) {
version1Endpoint := portainer.Endpoint{
ID: 1,
GroupID: 1,
@ -39,15 +38,13 @@ func Test_EndpointList_AgentVersion(t *testing.T) {
noVersionEndpoint := portainer.Endpoint{ID: 3, Type: portainer.AgentOnDockerEnvironment, GroupID: 1}
notAgentEnvironments := portainer.Endpoint{ID: 4, Type: portainer.DockerEnvironment, GroupID: 1}
handler, teardown := setupEndpointListHandler(t, []portainer.Endpoint{
handler := setupEndpointListHandler(t, []portainer.Endpoint{
notAgentEnvironments,
version1Endpoint,
version2Endpoint,
noVersionEndpoint,
})
defer teardown()
type endpointListAgentVersionTest struct {
endpointListTest
filter []string
@ -111,7 +108,7 @@ func Test_endpointList_edgeFilter(t *testing.T) {
regularTrustedEdgeStandard := portainer.Endpoint{ID: 4, UserTrusted: true, Edge: portainer.EnvironmentEdgeSettings{AsyncMode: false}, GroupID: 1, Type: portainer.EdgeAgentOnDockerEnvironment}
regularEndpoint := portainer.Endpoint{ID: 5, GroupID: 1, Type: portainer.DockerEnvironment}
handler, teardown := setupEndpointListHandler(t, []portainer.Endpoint{
handler := setupEndpointListHandler(t, []portainer.Endpoint{
trustedEdgeAsync,
untrustedEdgeAsync,
regularUntrustedEdgeStandard,
@ -119,8 +116,6 @@ func Test_endpointList_edgeFilter(t *testing.T) {
regularEndpoint,
})
defer teardown()
type endpointListEdgeTest struct {
endpointListTest
edgeAsync *bool
@ -184,9 +179,9 @@ func Test_endpointList_edgeFilter(t *testing.T) {
}
}
func setupEndpointListHandler(t *testing.T, endpoints []portainer.Endpoint) (handler *Handler, teardown func()) {
func setupEndpointListHandler(t *testing.T, endpoints []portainer.Endpoint) *Handler {
is := assert.New(t)
_, store, teardown := datastore.MustNewTestStore(t, true, true)
_, store := datastore.MustNewTestStore(t, true, true)
for _, endpoint := range endpoints {
err := store.Endpoint().Create(&endpoint)
@ -197,13 +192,13 @@ func setupEndpointListHandler(t *testing.T, endpoints []portainer.Endpoint) (han
is.NoError(err, "error creating a user")
bouncer := testhelpers.NewTestRequestBouncer()
handler = NewHandler(bouncer, nil)
handler := NewHandler(bouncer, nil)
handler.DataStore = store
handler.ComposeStackManager = testhelpers.NewComposeStackManager()
handler.SnapshotService, _ = snapshot.NewService("1s", store, nil, nil, nil)
return handler, teardown
return handler
}
func buildEndpointListRequest(query string) *http.Request {

16
api/http/handler/endpoints/filter_test.go
View file

@ -39,9 +39,7 @@ func Test_Filter_AgentVersion(t *testing.T) {
notAgentEnvironments,
}
handler, teardown := setupFilterTest(t, endpoints)
defer teardown()
handler := setupFilterTest(t, endpoints)
tests := []filterTest{
{
@ -89,9 +87,7 @@ func Test_Filter_edgeFilter(t *testing.T) {
regularEndpoint,
}
handler, teardown := setupFilterTest(t, endpoints)
defer teardown()
handler := setupFilterTest(t, endpoints)
tests := []filterTest{
{
@ -155,9 +151,9 @@ func runTest(t *testing.T, test filterTest, handler *Handler, endpoints []portai
}
func setupFilterTest(t *testing.T, endpoints []portainer.Endpoint) (handler *Handler, teardown func()) {
func setupFilterTest(t *testing.T, endpoints []portainer.Endpoint) *Handler {
is := assert.New(t)
_, store, teardown := datastore.MustNewTestStore(t, true, true)
_, store := datastore.MustNewTestStore(t, true, true)
for _, endpoint := range endpoints {
err := store.Endpoint().Create(&endpoint)
@ -168,9 +164,9 @@ func setupFilterTest(t *testing.T, endpoints []portainer.Endpoint) (handler *Han
is.NoError(err, "error creating a user")
bouncer := testhelpers.NewTestRequestBouncer()
handler = NewHandler(bouncer, nil)
handler := NewHandler(bouncer, nil)
handler.DataStore = store
handler.ComposeStackManager = testhelpers.NewComposeStackManager()
return handler, teardown
return handler
}

4
api/http/handler/endpoints/utils_update_edge_groups_test.go
View file

@ -70,10 +70,8 @@ func Test_updateEdgeGroups(t *testing.T) {
}
testFn := func(t *testing.T, testCase testCase) {
is := assert.New(t)
_, store, teardown := datastore.MustNewTestStore(t, true, true)
defer teardown()
_, store := datastore.MustNewTestStore(t, true, true)
err := store.Endpoint().Create(testCase.endpoint)
is.NoError(err)

4
api/http/handler/endpoints/utils_update_tags_test.go
View file

@ -74,10 +74,8 @@ func Test_updateTags(t *testing.T) {
}
testFn := func(t *testing.T, testCase testCase) {
is := assert.New(t)
_, store, teardown := datastore.MustNewTestStore(t, true, true)
defer teardown()
_, store := datastore.MustNewTestStore(t, true, true)
err := store.Endpoint().Create(testCase.endpoint)
is.NoError(err)