[chore] remove testify from tests for consistency with nomad (#345)

go.mod

@@ -29,10 +29,9 @@ require (
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/posener/complete v1.2.3
 	github.com/ryanuber/columnize v2.1.2+incompatible
-	github.com/shoenig/test v0.6.4
+	github.com/shoenig/test v0.6.6
 	github.com/spf13/afero v1.6.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.8.1
 	github.com/zclconf/go-cty v1.11.0
 	golang.org/x/term v0.5.0
 	golang.org/x/text v0.7.0
@@ -241,6 +240,7 @@ require (
 	github.com/skeema/knownhosts v1.1.0 // indirect
 	github.com/softlayer/softlayer-go v0.0.0-20180806151055-260589d94c7d // indirect
 	github.com/spf13/cast v1.3.1 // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible // indirect
 	github.com/tj/go-spin v1.1.0 // indirect

go.sum

@@ -1350,8 +1350,8 @@ github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y=
 github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shoenig/test v0.6.6 h1:Oe8TPH9wAbv++YPNDKJWUnI8Q4PPWCx3UbOfH+FxiMU=
+github.com/shoenig/test v0.6.6/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

internal/cli/formatters_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
+	"github.com/shoenig/test/must"
 )
 
 func Test_FormatList(t *testing.T) {
@@ -30,7 +30,7 @@ func Test_FormatList(t *testing.T) {
 	for _, tC := range testCases {
 		t.Run(tC.name, func(t *testing.T) {
 			out := formatList(tC.input)
-			require.Equal(t, tC.expected, out)
+			must.Eq(t, tC.expected, out)
 		})
 	}
 }
@@ -49,7 +49,7 @@ func Test_FormatTime(t *testing.T) {
 	}
 	for _, tC := range testCases {
 		t.Run(tC.name, func(t *testing.T) {
-			require.Equal(t, tC.expected, formatTime(tC.input))
+			must.Eq(t, tC.expected, formatTime(tC.input))
 		})
 	}
 }
@@ -60,5 +60,5 @@ func Test_FormatTime(t *testing.T) {
 func Test_FormatTimeDifference(t *testing.T) {
 	first := time.Now().Truncate(time.Second)
 	second := first.Add(6*time.Second + 22*time.Millisecond)
-	require.Equal(t, "6s", formatTimeDifference(first, second, time.Second))
+	must.Eq(t, "6s", formatTimeDifference(first, second, time.Second))
 }

internal/cli/testhelper/testhelper.go

@@ -14,7 +14,7 @@ import (
 	v1 "github.com/hashicorp/nomad-openapi/v1"
 	"github.com/hashicorp/nomad/command/agent"
 	"github.com/hashicorp/nomad/testutil"
-	"github.com/stretchr/testify/require"
+	"github.com/shoenig/test/must"
 )
 
 const testLogLevel = "ERROR"
@@ -42,9 +42,9 @@ func makeACLEnabledHTTPServer(t testing.TB, cb func(c *agent.Config)) *agent.Tes
 	srv := agent.NewTestAgent(t, t.Name(), aclCB)
 	testutil.WaitForLeader(t, srv.Agent.RPC)
 	c, err := NewTestClient(srv)
-	require.NoError(t, err)
+	must.NoError(t, err)
 	tResp, _, err := c.ACL().Bootstrap(c.WriteOpts().Ctx())
-	require.NoError(t, err)
+	must.NoError(t, err)
 
 	// Store the bootstrap ACL secret in the TestServer's client meta map
 	// so that it is easily accessible from tests.
@@ -157,8 +157,8 @@ func join(nodes ...*agent.TestAgent) {
 		addrs[i] = fmt.Sprintf("%s:%d", member.Addr, member.Port)
 	}
 	count, err := first.Client().Agent().Join(addrs...)
-	require.NoError(first.T, err)
-	require.Equal(first.T, len(nodes)-1, count)
+	must.NoError(first.T, err)
+	must.Eq(first.T, len(nodes)-1, count)
 }
 
 func NewTestClient(testAgent *agent.TestAgent, opts ...v1.ClientOption) (*v1.Client, error) {
@@ -267,7 +267,7 @@ func MakeTestNamespaces(t *testing.T, c *v1.Client) {
 		testNs.Name = &nsName
 		testNs.Description = &nsDesc
 		_, err := c.Namespaces().PostNamespace(opts.Ctx(), testNs)
-		require.NoError(t, err)
+		must.NoError(t, err)
 	}
 
 }

internal/cli/testhelper/testhelper_test.go

@@ -9,13 +9,13 @@ import (
 
 	v1 "github.com/hashicorp/nomad-openapi/v1"
 	"github.com/hashicorp/nomad/command/agent"
-	"github.com/stretchr/testify/require"
+	"github.com/shoenig/test/must"
 )
 
 func Test_HTTPTest(t *testing.T) {
 	HTTPTest(t, WithDefaultConfig(), func(s *agent.TestAgent) {
 		client, err := NewTestClient(s)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		q := &v1.QueryOpts{
 			Region:    v1.GlobalRegion,
@@ -24,15 +24,15 @@ func Test_HTTPTest(t *testing.T) {
 
 		result, err := client.Status().Leader(q.Ctx())
 		t.Logf("result: %q", *result)
-		require.NoError(t, err)
-		require.NotNil(t, result)
+		must.NoError(t, err)
+		must.NotNil(t, result)
 	})
 }
 
 func TestTestHelper_HTTPTestParallel(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(s *agent.TestAgent) {
 		client, err := NewTestClient(s)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		q := &v1.QueryOpts{
 			Region:    v1.GlobalRegion,
@@ -41,15 +41,15 @@ func TestTestHelper_HTTPTestParallel(t *testing.T) {
 
 		result, err := client.Status().Leader(q.Ctx())
 		t.Logf("result: %q", *result)
-		require.NoError(t, err)
-		require.NotNil(t, result)
+		must.NoError(t, err)
+		must.NotNil(t, result)
 	})
 }
 
 func TestTestHelper_HTTPTestWithACL(t *testing.T) {
 	HTTPTestWithACL(t, WithDefaultConfig(), func(s *agent.TestAgent) {
 		client, err := NewTestClient(s)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		q := &v1.QueryOpts{
 			Region:    v1.GlobalRegion,
@@ -59,15 +59,15 @@ func TestTestHelper_HTTPTestWithACL(t *testing.T) {
 
 		result, err := client.Status().Leader(q.Ctx())
 		t.Logf("result: %q", *result)
-		require.NoError(t, err)
-		require.NotNil(t, result)
+		must.NoError(t, err)
+		must.NotNil(t, result)
 	})
 }
 
 func TestTestHelper_HTTPTestWithACLParallel(t *testing.T) {
 	HTTPTestWithACLParallel(t, WithDefaultConfig(), func(s *agent.TestAgent) {
 		client, err := NewTestClient(s)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		q := &v1.QueryOpts{
 			Region:    v1.GlobalRegion,
@@ -77,8 +77,8 @@ func TestTestHelper_HTTPTestWithACLParallel(t *testing.T) {
 
 		result, err := client.Status().Leader(q.Ctx())
 		t.Logf("result: %q", *result)
-		require.NoError(t, err)
-		require.NotNil(t, result)
+		must.NoError(t, err)
+		must.NotNil(t, result)
 	})
 }
 
@@ -98,16 +98,16 @@ func TestTestHelper_HTTPTestParallel_TLSEnabled(t *testing.T) {
 				v1.WithAddress(s.HTTPAddr()),
 			)
 
-			require.NoError(t, err)
+			must.NoError(t, err)
 
 			q := &v1.QueryOpts{
 				Region:    v1.GlobalRegion,
 				Namespace: v1.DefaultNamespace,
 			}
 			result, err := client.Status().Leader(q.Ctx())
 			t.Logf("result: %q", *result)
-			require.NoError(t, err)
-			require.NotNil(t, result)
+			must.NoError(t, err)
+			must.NotNil(t, result)
 		},
 	)
 }
@@ -118,11 +118,11 @@ func TestTestHelper_MultiRegionCluster(t *testing.T) {
 		WithAgentConfig(LogLevel(testLogLevel), Region("rB")),
 		func(s1, s2 *agent.TestAgent) {
 			c1, err := NewTestClient(s1)
-			require.NoError(t, err)
+			must.NoError(t, err)
 			r, err := c1.Regions().GetRegions(c1.QueryOpts().Ctx())
-			require.NoError(t, err)
+			must.NoError(t, err)
 
-			require.ElementsMatch(t, []string{"rA", "rB"}, *r)
+			must.SliceContainsAll(t, []string{"rA", "rB"}, *r)
 		},
 	)
 }
@@ -133,11 +133,11 @@ func TestTestHelper_MultiRegionClusterParallel(t *testing.T) {
 		WithAgentConfig(LogLevel(testLogLevel), Region("rB")),
 		func(s1, s2 *agent.TestAgent) {
 			c1, err := NewTestClient(s1)
-			require.NoError(t, err)
+			must.NoError(t, err)
 			r, err := c1.Regions().GetRegions(c1.QueryOpts().Ctx())
-			require.NoError(t, err)
+			must.NoError(t, err)
 
-			require.ElementsMatch(t, []string{"rA", "rB"}, *r)
+			must.SliceContainsAll(t, []string{"rA", "rB"}, *r)
 		},
 	)
 }
@@ -146,84 +146,84 @@ func TestTestHelper_NomadRun(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(srv *agent.TestAgent) {
 		NomadRun(srv, getTestNomadJobPath("simple_raw_exec"))
 		c, err := NewTestClient(srv)
-		require.NoError(t, err)
+		must.NoError(t, err)
 		jR, _, err := c.Jobs().GetJobs(c.QueryOpts().Ctx())
-		require.NoError(t, err)
-		require.Equal(t, 1, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 1, len(*jR))
 	})
 }
 
 func TestTestHelper_NomadJobStatus(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(srv *agent.TestAgent) {
 		NomadRun(srv, getTestNomadJobPath("simple_raw_exec"))
 		job, err := NomadJobStatus(srv, "simple_raw_exec")
-		require.NoError(t, err)
-		require.Equal(t, "simple_raw_exec", job.GetName())
+		must.NoError(t, err)
+		must.Eq(t, "simple_raw_exec", job.GetName())
 	})
 }
 
 func TestTestHelper_NomadStop(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(srv *agent.TestAgent) {
 		c, err := NewTestClient(srv)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		NomadRun(srv, getTestNomadJobPath("simple_raw_exec"))
 		jR, _, err := c.Jobs().GetJobs(c.QueryOpts().Ctx())
-		require.NoError(t, err)
-		require.Equal(t, 1, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 1, len(*jR))
 
 		NomadStop(srv, "simple_raw_exec")
 		job, _, err := c.Jobs().GetJob(c.QueryOpts().Ctx(), "simple_raw_exec")
-		require.NoError(t, err)
-		require.True(t, job.GetStop())
+		must.NoError(t, err)
+		must.True(t, job.GetStop())
 	})
 }
 
 func TestTestHelper_NomadPurge(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(srv *agent.TestAgent) {
 		c, err := NewTestClient(srv)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		NomadRun(srv, getTestNomadJobPath("simple_raw_exec"))
 		jR, _, err := c.Jobs().GetJobs(c.QueryOpts().Ctx())
-		require.NoError(t, err)
-		require.Equal(t, 1, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 1, len(*jR))
 
 		NomadPurge(srv, "simple_raw_exec")
 		jR, _, err = c.Jobs().GetJobs(c.QueryOpts().Ctx())
-		require.NoError(t, err)
-		require.Equal(t, 0, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 0, len(*jR))
 	})
 }
 
 func TestTestHelper_NomadCleanup(t *testing.T) {
 	HTTPTestParallel(t, WithDefaultConfig(), func(srv *agent.TestAgent) {
 		c, err := NewTestClient(srv)
-		require.NoError(t, err)
+		must.NoError(t, err)
 		MakeTestNamespaces(t, c)
 
 		qoAllNS := c.QueryOpts().WithNamespace("*")
 
 		err = NomadRun(srv, getTestNomadJobPath("simple_raw_exec"))
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		err = NomadRun(srv, getTestNomadJobPath("simple_raw_exec"), v1.WithDefaultNamespace("env"))
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		jR, qm, err := c.Jobs().GetJobs(qoAllNS.Ctx())
 		fmt.Printf("\n\n-- qm: %+#v\n\n", qm)
-		require.NoError(t, err)
-		require.Equal(t, 2, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 2, len(*jR))
 
 		err, warn := NomadCleanup(srv)
-		require.NoError(t, err)
+		must.NoError(t, err)
 
 		if warn != nil {
 			t.Log("warnings cleaning cluster", "warn", warn.Error())
 		}
 
 		jR, _, err = c.Jobs().GetJobs(qoAllNS.Ctx())
-		require.NoError(t, err)
-		require.Equal(t, 0, len(*jR))
+		must.NoError(t, err)
+		must.Eq(t, 0, len(*jR))
 	})
 }

internal/creator/creator_test.go

@@ -7,13 +7,13 @@ import (
 	"os"
 	"testing"
 
-	"github.com/stretchr/testify/require"
+	"github.com/shoenig/test/must"
 )
 
 func TestInit(t *testing.T) {
-	require.NotNil(t, tpl)
+	must.NotNil(t, tpl)
 	err := tpl.ExecuteTemplate(os.Stdout, "pack_readme.md", map[string]string{
 		"PackName": "foo",
 	})
-	require.NoError(t, err)
+	must.NoError(t, err)
 }