Merge pull request #396 from hashicorp/return-after-fatal

Make mockT.Fatal halt execution

Author: appilon

helper/resource/testing.go

@@ -558,7 +558,6 @@ func Test(t TestT, c TestCase) {
 	// We require verbose mode so that the user knows what is going on.
 	if !testTesting && !testing.Verbose() && !c.IsUnitTest {
 		t.Fatal("Acceptance tests must be run with the -v flag on tests")
-		return
 	}
 
 	// get instances of all providers, so we can use the individual

helper/resource/testing_test.go

@@ -509,22 +509,26 @@ func TestTest_stepError(t *testing.T) {
 
 func TestTest_factoryError(t *testing.T) {
 	resourceFactoryError := fmt.Errorf("resource factory error")
-
 	factory := func() (terraform.ResourceProvider, error) {
 		return nil, resourceFactoryError
 	}
-
 	mt := new(mockT)
-	Test(mt, TestCase{
-		ProviderFactories: map[string]terraform.ResourceProviderFactory{
-			"test": factory,
-		},
-		Steps: []TestStep{
-			{
-				ExpectError: regexp.MustCompile("resource factory error"),
+
+	func() {
+		defer func() {
+			if r := recover(); r != nil {
+				if !strings.HasPrefix(r.(string), "mockT") {
+					panic(r)
+				}
+			}
+		}()
+		Test(mt, TestCase{
+			ProviderFactories: map[string]terraform.ResourceProviderFactory{
+				"test": factory,
 			},
-		},
-	})
+			IsUnitTest: true,
+		})
+	}()
 
 	if !mt.failed() {
 		t.Fatal("test should've failed")
@@ -751,6 +755,8 @@ func (t *mockT) Fatal(args ...interface{}) {
 	t.FatalCalled = true
 	t.FatalArgs = args
 	t.f = true
+
+	panic("mockT.Fatal")
 }
 
 func (t *mockT) Parallel() {