beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Setup project for testing

Browse Source
This commit is contained in:
sophia 2021-07-19 11:04:01 -05:00 committed by Paul Hinze
parent afb2dcdc8b
commit 5fc4cdcc98
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/core/project.go
View File

@ -471,7 +471,7 @@ func WithProjectName(name string) ProjectOption {
}
}
// WithBasisRef is used to load or initialize the basis
// WithBasisRef is used to load or initialize the project
func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
return func(p *Project) (err error) {
// Basis must be set before we continue
@ -495,11 +495,6 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
},
)
if err != nil {
return err
}
if result.Found {
project = result.Project
} else {
var result *vagrant_server.UpsertProjectResponse
result, err = p.Client().UpsertProject(p.ctx,
&vagrant_server.UpsertProjectRequest{
@ -514,7 +509,10 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
return
}
project = result.Project
} else {
project = result.Project
}
// Before we init, validate basis is consistent
if project.Basis.ResourceId != r.Basis.ResourceId {
p.logger.Error("invalid basis for project", "request-basis", r.Basis,

25
internal/core/testing_project.go
View File

@ -12,10 +12,25 @@ import (
"github.com/hashicorp/vagrant-plugin-sdk/component"
componentmocks "github.com/hashicorp/vagrant-plugin-sdk/component/mocks"
"github.com/hashicorp/vagrant-plugin-sdk/datadir"
"github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
"github.com/hashicorp/vagrant/internal/factory"
"github.com/hashicorp/vagrant/internal/server/singleprocess"
)
var TestingTypeMap = map[component.Type]interface{}{
component.AuthenticatorType: (*component.Authenticator)(nil),
component.CommandType: (*component.Command)(nil),
component.CommunicatorType: (*component.Communicator)(nil),
component.ConfigType: (*component.Config)(nil),
component.GuestType: (*component.Guest)(nil),
component.HostType: (*component.Host)(nil),
component.LogPlatformType: (*component.LogPlatform)(nil),
component.LogViewerType: (*component.LogViewer)(nil),
component.ProviderType: (*component.Provider)(nil),
component.ProvisionerType: (*component.Provisioner)(nil),
component.SyncedFolderType: (*component.SyncedFolder)(nil),
}
// TestProject returns a fully in-memory and side-effect free Project that
// can be used for testing. Additional options can be given to provide your own
// factories, configuration, etc.
@ -30,12 +45,12 @@ func TestProject(t testing.T, opts ...BasisOption) *Project {
defaultOpts := []BasisOption{
WithClient(singleprocess.TestServer(t)),
WithBasisDataDir(projDir),
// WithBasisConfig
WithBasisRef(&vagrant_plugin_sdk.Ref_Basis{Name: "test-basis"}),
}
// Create the default factory for all component types
for typ := range component.TypeMap {
f, _ := TestFactorySingle(t, typ, "test")
for typ := range TestingTypeMap {
f, _ := TestFactorySingle(t, typ, "test-basis")
defaultOpts = append(defaultOpts, WithFactory(typ, f))
}
@ -44,7 +59,9 @@ func TestProject(t testing.T, opts ...BasisOption) *Project {
// t.Cleanup(func() { p.Close() })
b, err := NewBasis(context.Background(), append(defaultOpts, opts...)...)
p, err := b.LoadProject()
p, err := b.LoadProject([]ProjectOption{
WithProjectRef(&vagrant_plugin_sdk.Ref_Project{Basis: b.Ref().(*vagrant_plugin_sdk.Ref_Basis), Name: "test-project"}),
}...)
return p
}