From 605c7f9d9feb089a7391c0320fb1ae7e4fceba07 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Mon, 27 Jun 2022 11:23:27 -0700
Subject: [PATCH] Force fatal when failing to setup machine

---
 internal/core/testing_basis.go  | 12 ++++++------
 internal/core/testing_target.go | 25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/internal/core/testing_basis.go b/internal/core/testing_basis.go
index 49250fb9d..06cb61f04 100644
--- a/internal/core/testing_basis.go
+++ b/internal/core/testing_basis.go
@@ -106,9 +106,9 @@ func TestBasis(t testing.T, opts ...BasisOption) (b *Basis) {
 	return
 }
 
-func WithTestBasisConfig(config *vagrant_plugin_sdk.Vagrantfile_Vagrantfile) BasisOption {
-	return func(m *Basis) (err error) {
-		m.basis.Configuration = config
-		return
-	}
-}
+// func WithTestBasisConfig(config *vagrant_plugin_sdk.Vagrantfile_Vagrantfile) BasisOption {
+// 	return func(m *Basis) (err error) {
+// 		m.basis.Configuration = config
+// 		return
+// 	}
+// }
diff --git a/internal/core/testing_target.go b/internal/core/testing_target.go
index 91b1b324e..d3f5de23c 100644
--- a/internal/core/testing_target.go
+++ b/internal/core/testing_target.go
@@ -27,6 +27,10 @@ func TestTarget(t testing.T, tp *Project, tt *vagrant_server.Target) (target *Ta
 	target, err = tp.LoadTarget([]TargetOption{
 		WithTargetRef(&vagrant_plugin_sdk.Ref_Target{Project: tp.Ref().(*vagrant_plugin_sdk.Ref_Project), Name: testingTarget.Name}),
 	}...)
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
 	tp.project.Targets = append(tp.project.Targets, target.Ref().(*vagrant_plugin_sdk.Ref_Target))
 	return
 }
@@ -49,6 +53,10 @@ func TestMinimalTarget(t testing.T) (target *Target, err error) {
 		WithTargetRef(&vagrant_plugin_sdk.Ref_Target{Project: tp.Ref().(*vagrant_plugin_sdk.Ref_Project), Name: "test-target"}),
 	}...)
 
+	if err != nil {
+		t.Fatal(err)
+	}
+
 	return
 }
 
@@ -67,6 +75,10 @@ func TestMachine(t testing.T, tp *Project, opts ...TestMachineOption) (machine *
 			err = multierror.Append(err, oerr)
 		}
 	}
+
+	if err != nil {
+		t.Fatal(err)
+	}
 	return
 }
 
@@ -74,9 +86,14 @@ func TestMachine(t testing.T, tp *Project, opts ...TestMachineOption) (machine *
 // that will work for testing
 func TestMinimalMachine(t testing.T) (machine *Machine, err error) {
 	tp := TestMinimalProject(t)
-	tt, _ := TestTarget(t, tp, &vagrant_server.Target{})
+	tt, err := TestTarget(t, tp, &vagrant_server.Target{})
+	if err != nil {
+		t.Fatal(err)
+		return
+	}
 	specialized, err := tt.Specialize((*core.Machine)(nil))
 	if err != nil {
+		t.Fatal(err)
 		return nil, err
 	}
 	machine = specialized.(*Machine)
@@ -88,14 +105,12 @@ type TestMachineOption func(*Machine) error
 
 func WithTestTargetMinimalConfig() TestMachineOption {
 	return func(m *Machine) (err error) {
-		m.target.Configuration = &vagrant_plugin_sdk.Vagrantfile_MachineConfig{
-			ConfigVm: &vagrant_plugin_sdk.Vagrantfile_ConfigVM{},
-		}
+		m.target.Configuration = &vagrant_plugin_sdk.Args_ConfigData{}
 		return
 	}
 }
 
-func WithTestTargetConfig(config *vagrant_plugin_sdk.Vagrantfile_MachineConfig) TestMachineOption {
+func WithTestTargetConfig(config *vagrant_plugin_sdk.Args_ConfigData) TestMachineOption {
 	return func(m *Machine) (err error) {
 		m.target.Configuration = config
 		return