chore: General Cleanup

testutil/vault.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/nomad/nomad/structs/config"
 	vapi "github.com/hashicorp/vault/api"
 	testing "github.com/mitchellh/go-testing-interface"
+	"github.com/stretchr/testify/require"
 )
 
 // TestVault is a test helper. It uses a fork/exec model to create a test Vault
@@ -205,7 +206,7 @@ func (tv *TestVault) Stop() {
 		case <-tv.waitCh:
 			return
 		case <-time.After(1 * time.Second):
-			tv.t.Error("Timed out waiting for vault to terminate")
+			require.Fail(tv.t, "Timed out waiting for vault to terminate")
 		}
 	}
 }