Skip to content

Commit fdfbb96

Browse files
jgiannuzzijgiannuzzi
authored
Refactor test suite setup/teardown (#645)
* Refactor BaseTestSuite helper to provide setup/teardown * Refactor bucket storage provider helpers to provide setup/teardown * Adapt all tests to use refactored setup/teardown * Rename UnloadFixtures to TruncateTables
1 parent 1d5df11 commit fdfbb96

File tree

77 files changed

+465
-1891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+465
-1891
lines changed

‎tests/integration/golang/admin/namespace/create_test.go

-22
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import (
1010
"github.com/PuerkitoBio/goquery"
1111
"github.com/stretchr/testify/suite"
1212

13-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
14-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1513
"github.com/G-Research/fasttrackml/pkg/ui/admin/request"
1614
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
1715
)
@@ -25,16 +23,6 @@ func TestCreateNamespaceTestSuite(t *testing.T) {
2523
}
2624

2725
func (s *CreateNamespaceTestSuite) Test_Ok() {
28-
defer func() {
29-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
30-
}()
31-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
32-
ID: 1,
33-
Code: "default",
34-
DefaultExperimentID: common.GetPointer(int32(0)),
35-
})
36-
s.Require().Nil(err)
37-
3826
requests := []request.Namespace{
3927
{
4028
Code: "test2",
@@ -64,16 +52,6 @@ func (s *CreateNamespaceTestSuite) Test_Ok() {
6452
}
6553

6654
func (s *CreateNamespaceTestSuite) Test_Error() {
67-
defer func() {
68-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
69-
}()
70-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
71-
ID: 1,
72-
Code: "default",
73-
DefaultExperimentID: common.GetPointer(int32(0)),
74-
})
75-
s.Require().Nil(err)
76-
7755
testData := []struct {
7856
name string
7957
request *request.Namespace

‎tests/integration/golang/admin/namespace/delete_test.go

-18
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,7 @@ func TestDeleteNamespaceTestSuite(t *testing.T) {
2323
}
2424

2525
func (s *DeleteNamespaceTestSuite) Test_Ok() {
26-
defer func() {
27-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
28-
}()
2926
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
30-
ID: 1,
31-
Code: "default",
32-
DefaultExperimentID: common.GetPointer(int32(0)),
33-
})
34-
s.Require().Nil(err)
35-
_, err = s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
3627
ID: 2,
3728
Code: "test2",
3829
Description: "test namespace 2 description",
@@ -73,16 +64,7 @@ func (s *DeleteNamespaceTestSuite) Test_Ok() {
7364
}
7465

7566
func (s *DeleteNamespaceTestSuite) Test_Error() {
76-
defer func() {
77-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
78-
}()
7967
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
80-
ID: 1,
81-
Code: "default",
82-
DefaultExperimentID: common.GetPointer(int32(0)),
83-
})
84-
s.Require().Nil(err)
85-
_, err = s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
8668
ID: 2,
8769
Code: "test2",
8870
Description: "test namespace 2 description",

‎tests/integration/golang/admin/namespace/update_test.go

-18
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@ func TestUpdateNamespaceTestSuite(t *testing.T) {
2424
}
2525

2626
func (s *UpdateNamespaceTestSuite) Test_Ok() {
27-
defer func() {
28-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
29-
}()
30-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
31-
ID: 1,
32-
Code: "default",
33-
DefaultExperimentID: common.GetPointer(int32(0)),
34-
})
35-
s.Require().Nil(err)
3627
ns, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
3728
ID: 2,
3829
Code: "test2",
@@ -61,16 +52,7 @@ func (s *UpdateNamespaceTestSuite) Test_Ok() {
6152
}
6253

6354
func (s *UpdateNamespaceTestSuite) Test_Error() {
64-
defer func() {
65-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
66-
}()
6755
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
68-
ID: 1,
69-
Code: "default",
70-
DefaultExperimentID: common.GetPointer(int32(0)),
71-
})
72-
s.Require().Nil(err)
73-
_, err = s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
7456
ID: 2,
7557
Code: "test2",
7658
Description: "test namespace 2 description",

‎tests/integration/golang/aim/app/create_app_test.go

-25
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
package run
44

55
import (
6-
"context"
76
"net/http"
87
"testing"
98

109
"github.com/stretchr/testify/suite"
1110

1211
"github.com/G-Research/fasttrackml/pkg/api/aim/request"
1312
"github.com/G-Research/fasttrackml/pkg/api/aim/response"
14-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
15-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1613
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
1714
)
1815

@@ -25,17 +22,6 @@ func TestCreateAppTestSuite(t *testing.T) {
2522
}
2623

2724
func (s *CreateAppTestSuite) Test_Ok() {
28-
defer func() {
29-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
30-
}()
31-
32-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
33-
ID: 1,
34-
Code: "default",
35-
DefaultExperimentID: common.GetPointer(int32(0)),
36-
})
37-
s.Require().Nil(err)
38-
3925
tests := []struct {
4026
name string
4127
requestBody request.CreateApp
@@ -74,17 +60,6 @@ func (s *CreateAppTestSuite) Test_Ok() {
7460
}
7561

7662
func (s *CreateAppTestSuite) Test_Error() {
77-
defer func() {
78-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
79-
}()
80-
81-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
82-
ID: 1,
83-
Code: "default",
84-
DefaultExperimentID: common.GetPointer(int32(0)),
85-
})
86-
s.Require().Nil(err)
87-
8863
tests := []struct {
8964
name string
9065
requestBody any

‎tests/integration/golang/aim/app/delete_app_test.go

+3-27
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
"github.com/stretchr/testify/suite"
1313

1414
"github.com/G-Research/fasttrackml/pkg/api/aim/response"
15-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
16-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1715
"github.com/G-Research/fasttrackml/pkg/database"
1816
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
1917
)
@@ -27,25 +25,14 @@ func TestDeleteAppTestSuite(t *testing.T) {
2725
}
2826

2927
func (s *DeleteAppTestSuite) Test_Ok() {
30-
defer func() {
31-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
32-
}()
33-
34-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
35-
ID: 1,
36-
Code: "default",
37-
DefaultExperimentID: common.GetPointer(int32(0)),
38-
})
39-
s.Require().Nil(err)
40-
4128
app, err := s.AppFixtures.CreateApp(context.Background(), &database.App{
4229
Base: database.Base{
4330
ID: uuid.New(),
4431
CreatedAt: time.Now(),
4532
},
4633
Type: "mpi",
4734
State: database.AppState{},
48-
NamespaceID: namespace.ID,
35+
NamespaceID: s.DefaultNamespace.ID,
4936
})
5037
s.Require().Nil(err)
5138

@@ -75,25 +62,14 @@ func (s *DeleteAppTestSuite) Test_Ok() {
7562
}
7663

7764
func (s *DeleteAppTestSuite) Test_Error() {
78-
defer func() {
79-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
80-
}()
81-
82-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
83-
ID: 1,
84-
Code: "default",
85-
DefaultExperimentID: common.GetPointer(int32(0)),
86-
})
87-
s.Require().Nil(err)
88-
89-
_, err = s.AppFixtures.CreateApp(context.Background(), &database.App{
65+
_, err := s.AppFixtures.CreateApp(context.Background(), &database.App{
9066
Base: database.Base{
9167
ID: uuid.New(),
9268
CreatedAt: time.Now(),
9369
},
9470
Type: "mpi",
9571
State: database.AppState{},
96-
NamespaceID: namespace.ID,
72+
NamespaceID: s.DefaultNamespace.ID,
9773
})
9874
s.Require().Nil(err)
9975

‎tests/integration/golang/aim/app/get_app_test.go

+1-25
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import (
1111
"github.com/stretchr/testify/suite"
1212

1313
"github.com/G-Research/fasttrackml/pkg/api/aim/response"
14-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
15-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1614
"github.com/G-Research/fasttrackml/pkg/database"
1715
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
1816
)
@@ -26,25 +24,14 @@ func TestGetAppTestSuite(t *testing.T) {
2624
}
2725

2826
func (s *GetAppTestSuite) Test_Ok() {
29-
defer func() {
30-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
31-
}()
32-
33-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
34-
ID: 1,
35-
Code: "default",
36-
DefaultExperimentID: common.GetPointer(int32(0)),
37-
})
38-
s.Require().Nil(err)
39-
4027
app, err := s.AppFixtures.CreateApp(context.Background(), &database.App{
4128
Base: database.Base{
4229
ID: uuid.New(),
4330
CreatedAt: time.Now(),
4431
},
4532
Type: "mpi",
4633
State: database.AppState{},
47-
NamespaceID: namespace.ID,
34+
NamespaceID: s.DefaultNamespace.ID,
4835
})
4936
s.Require().Nil(err)
5037

@@ -58,17 +45,6 @@ func (s *GetAppTestSuite) Test_Ok() {
5845
}
5946

6047
func (s *GetAppTestSuite) Test_Error() {
61-
defer func() {
62-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
63-
}()
64-
65-
_, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
66-
ID: 1,
67-
Code: "default",
68-
DefaultExperimentID: common.GetPointer(int32(0)),
69-
})
70-
s.Require().Nil(err)
71-
7248
tests := []struct {
7349
name string
7450
idParam uuid.UUID

‎tests/integration/golang/aim/app/get_apps_test.go

+6-15
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import (
99
"github.com/stretchr/testify/suite"
1010

1111
"github.com/G-Research/fasttrackml/pkg/api/aim/response"
12-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
13-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1412
"github.com/G-Research/fasttrackml/pkg/database"
1513
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
1614
)
@@ -20,7 +18,11 @@ type GetAppsTestSuite struct {
2018
}
2119

2220
func TestGetAppsTestSuite(t *testing.T) {
23-
suite.Run(t, new(GetAppsTestSuite))
21+
suite.Run(t, &GetAppsTestSuite{
22+
helpers.BaseTestSuite{
23+
ResetOnSubTest: true,
24+
},
25+
})
2426
}
2527

2628
func (s *GetAppsTestSuite) Test_Ok() {
@@ -39,18 +41,7 @@ func (s *GetAppsTestSuite) Test_Ok() {
3941
}
4042
for _, tt := range tests {
4143
s.Run(tt.name, func() {
42-
defer func() {
43-
s.Require().Nil(s.AppFixtures.UnloadFixtures())
44-
}()
45-
46-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
47-
ID: 1,
48-
Code: "default",
49-
DefaultExperimentID: common.GetPointer(int32(0)),
50-
})
51-
s.Require().Nil(err)
52-
53-
apps, err := s.AppFixtures.CreateApps(context.Background(), namespace, tt.expectedAppCount)
44+
apps, err := s.AppFixtures.CreateApps(context.Background(), s.DefaultNamespace, tt.expectedAppCount)
5445
s.Require().Nil(err)
5546

5647
var resp []response.App

‎tests/integration/golang/aim/app/update_app_test.go

+2-26
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import (
1313

1414
"github.com/G-Research/fasttrackml/pkg/api/aim/request"
1515
"github.com/G-Research/fasttrackml/pkg/api/aim/response"
16-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/common"
17-
"github.com/G-Research/fasttrackml/pkg/api/mlflow/dao/models"
1816
"github.com/G-Research/fasttrackml/pkg/database"
1917
"github.com/G-Research/fasttrackml/tests/integration/golang/helpers"
2018
)
@@ -28,25 +26,14 @@ func TestUpdateAppTestSuite(t *testing.T) {
2826
}
2927

3028
func (s *UpdateAppTestSuite) Test_Ok() {
31-
defer func() {
32-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
33-
}()
34-
35-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
36-
ID: 1,
37-
Code: "default",
38-
DefaultExperimentID: common.GetPointer(int32(0)),
39-
})
40-
s.Require().Nil(err)
41-
4229
app, err := s.AppFixtures.CreateApp(context.Background(), &database.App{
4330
Base: database.Base{
4431
ID: uuid.New(),
4532
CreatedAt: time.Now(),
4633
},
4734
Type: "mpi",
4835
State: database.AppState{},
49-
NamespaceID: namespace.ID,
36+
NamespaceID: s.DefaultNamespace.ID,
5037
})
5138
s.Require().Nil(err)
5239

@@ -96,25 +83,14 @@ func (s *UpdateAppTestSuite) Test_Ok() {
9683
}
9784

9885
func (s *UpdateAppTestSuite) Test_Error() {
99-
defer func() {
100-
s.Require().Nil(s.NamespaceFixtures.UnloadFixtures())
101-
}()
102-
103-
namespace, err := s.NamespaceFixtures.CreateNamespace(context.Background(), &models.Namespace{
104-
ID: 1,
105-
Code: "default",
106-
DefaultExperimentID: common.GetPointer(int32(0)),
107-
})
108-
s.Require().Nil(err)
109-
11086
app, err := s.AppFixtures.CreateApp(context.Background(), &database.App{
11187
Base: database.Base{
11288
ID: uuid.New(),
11389
CreatedAt: time.Now(),
11490
},
11591
Type: "mpi",
11692
State: database.AppState{},
117-
NamespaceID: namespace.ID,
93+
NamespaceID: s.DefaultNamespace.ID,
11894
})
11995
s.Require().Nil(err)
12096

0 commit comments

Comments
 (0)