cleaning up tests

dependency/consul_exported_services_test.go

@@ -137,20 +137,17 @@ func TestListExportedServicesQuery_Fetch(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 
-			q := &ListExportedServicesQuery{
-				stopCh:    make(chan struct{}),
-				partition: tc.partition,
-			}
+			q, err := NewListExportedServicesQuery(tc.partition)
+			require.NoError(t, err)
 
 			actual, _, err := q.Fetch(testClients, nil)
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
+			require.NoError(t, err)
 
 			require.ElementsMatch(t, tc.expected, actual)
 
 			// need to clean up because we use a single shared consul instance
 			_, err = testClients.Consul().ConfigEntries().Delete(capi.ExportedServices, tc.exportedServices.Name, &capi.WriteOptions{Partition: tc.partition})
+			require.NoError(t, err)
 		})
 	}
 }

dependency/consul_partitions_test.go

@@ -44,24 +44,22 @@ func TestNewListPartitionsQuery(t *testing.T) {
 }
 
 func TestListPartitionsQuery_Fetch(t *testing.T) {
-	cases := []struct {
-		name string
-		exp  []Partition
-	}{
+	expected := []*Partition{
+		{
+			Name:        "default",
+			Description: "Builtin Default Partition",
+		},
+
 		{
-			"default",
-			[]Partition{{Name: "dc1", Description: "dc1"}},
+			Name:        "foo",
+			Description: "",
 		},
 	}
 
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			d, err := NewListPartitionsQuery()
-			require.NoError(t, err)
+	d, err := NewListPartitionsQuery()
+	require.NoError(t, err)
 
-			act, _, err := d.Fetch(nil, nil)
-			require.NoError(t, err)
-			assert.Equal(t, tc.exp, act)
-		})
-	}
+	act, _, err := d.Fetch(testClients, nil)
+	require.NoError(t, err)
+	assert.Equal(t, expected, act)
 }

dependency/dependency_test.go

@@ -43,6 +43,20 @@ func TestMain(m *testing.M) {
 	tb := &test.TestingTB{}
 	runTestConsul(tb)
 	clients := NewClientSet()
+
+	defer func() {
+		// Attempt to recover from a panic and stop the server. If we don't
+		// stop it, the panic will cause the server to remain running in
+		// the background. Here we catch the panic and the re-raise it.
+		// This doesn't do anything if we get panics in individual test cases
+		if r := recover(); r != nil {
+			testConsul.Stop()
+			testVault.Stop()
+			testNomad.Stop()
+			panic(r)
+		}
+	}()
+
 	if err := clients.CreateConsulClient(&CreateConsulClientInput{
 		Address: testConsul.HTTPAddr,
 	}); err != nil {
@@ -111,24 +125,7 @@ func TestMain(m *testing.M) {
 		Fatalf("failed to start Nomad: %v\n", err)
 	}
 
-	exitCh := make(chan int, 1)
-	func() {
-		defer func() {
-			// Attempt to recover from a panic and stop the server. If we don't
-			// stop it, the panic will cause the server to remain running in
-			// the background. Here we catch the panic and the re-raise it.
-			if r := recover(); r != nil {
-				testConsul.Stop()
-				testVault.Stop()
-				testNomad.Stop()
-				panic(r)
-			}
-		}()
-
-		exitCh <- m.Run()
-	}()
-
-	exit := <-exitCh
+	exit := m.Run()
 
 	tb.DoCleanup()
 	testConsul.Stop()

dependency/nomad_var_get_test.go

@@ -121,7 +121,6 @@ func TestNewNVGetQuery(t *testing.T) {
 			assert.Equal(t, tc.exp, act)
 		})
 	}
-	fmt.Println("done")
 }
 
 func TestNVGetQuery_Fetch(t *testing.T) {