Skip to content
Snippets Groups Projects
Commit 5a92d82b authored by Anton Sattarov's avatar Anton Sattarov :cucumber:
Browse files

remove MigrateOptions.Wait

parent 5599d8fa
No related branches found
No related tags found
No related merge requests found
Subproject commit f954a6b764e2d0f60b911582fb28a078ebfcce93
Subproject commit 062d090c3a8e44d3cc4ca61678bf58c0e7377812
......@@ -7,7 +7,6 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/schema"
......@@ -140,7 +139,7 @@ func (s *Setup) InstallCollections(ctx context.Context) (err error) {
}
if migrate {
if err = s.content.Environments.Migrate(ctx, s.SpaceID, s.EnvironmentID, &environments.MigrateOptions{Wait: true}); err != nil {
if err = s.content.Environments.Migrate(ctx, s.SpaceID, s.EnvironmentID); err != nil {
s.logger.Error(
"Failed to migrate environment",
zap.String("Space ID", s.SpaceID),
......
......@@ -43,7 +43,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String())).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -57,7 +57,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("Create", mock.Anything, &collections.Collection{ID: "1", SpaceID: "sp", Name: "space", EnvID: "env", View: &collections.View{SpaceID: "sp", EnvID: "env", CollectionID: "3"}}).Return(&collections.Collection{ID: "1", SpaceID: "sp", Name: "space", EnvID: "env", View: &collections.View{SpaceID: "sp", EnvID: "env", CollectionID: "3"}}, nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -88,7 +88,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "2", schema.New("name", field.String())).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Twice()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Twice()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -116,7 +116,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -143,7 +143,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -159,7 +159,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String()).WithMetadata(extension.ExtensionMetadataKey, "test-extension")).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -174,7 +174,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("Update", mock.Anything, &collections.Collection{ID: "1", SpaceID: "sp", EnvID: "env", View: &collections.View{SpaceID: "sp3", EnvID: environments.DefaultEnvironment, CollectionID: "3"}}).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(nil).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(nil).Once()
},
wantErr: func(t *testing.T, err error) {
assert.NoError(t, err)
......@@ -189,7 +189,7 @@ func TestSetup_InstallCollections(t *testing.T) {
svc.On("SetSchema", mock.Anything, "sp", "env", "1", schema.New("name", field.String())).Return(nil).Once()
},
envsCall: func(svc *envmocks.Environments) {
svc.On("Migrate", mock.Anything, "sp", "env", &environments.MigrateOptions{Wait: true}).Return(errors.New("migrate error")).Once()
svc.On("Migrate", mock.Anything, "sp", "env").Return(errors.New("migrate error")).Once()
},
wantErr: func(t *testing.T, err error) {
assert.Error(t, err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment