service: improve tests by avoiding making assertions inside goroutines

mesg-foundation · Oct 3, 2018 · e0b6dc6 · e0b6dc6
1 parent 172ac0e
commit e0b6dc6
Showing 1 changed file with 21 additions and 26 deletions.
diff --git a/service/service_test.go b/service/service_test.go
@@ -68,34 +68,9 @@ func TestNew(t *testing.T) {
 	archive, err := xarchive.GzippedTar(path)
 	require.NoError(t, err)
 
-	statuses := make(chan DeployStatus)
+	statuses := make(chan DeployStatus, 4)
 	var wg sync.WaitGroup
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
-		require.Equal(t, DeployStatus{
-			Message: "Receiving service context...",
-			Type:    DRunning,
-		}, <-statuses)
-
-		require.Equal(t, DeployStatus{
-			Message: "Service context received with success",
-			Type:    DDonePositive,
-		}, <-statuses)
-
-		require.Equal(t, DeployStatus{
-			Message: "Building Docker image...",
-			Type:    DRunning,
-		}, <-statuses)
-
-		require.Equal(t, DeployStatus{
-			Message: "Image built with success",
-			Type:    DDonePositive,
-		}, <-statuses)
-	}()
-
 	s, err := New(archive,
 		ContainerOption(mc),
 		DeployStatusOption(statuses),
@@ -104,6 +79,26 @@ func TestNew(t *testing.T) {
 	require.Equal(t, "service", s.Dependencies[0].Key)
 	require.Equal(t, hash, s.Dependencies[0].Image)
 
+	require.Equal(t, DeployStatus{
+		Message: "Receiving service context...",
+		Type:    DRunning,
+	}, <-statuses)
+
+	require.Equal(t, DeployStatus{
+		Message: "Service context received with success",
+		Type:    DDonePositive,
+	}, <-statuses)
+
+	require.Equal(t, DeployStatus{
+		Message: "Building Docker image...",
+		Type:    DRunning,
+	}, <-statuses)
+
+	require.Equal(t, DeployStatus{
+		Message: "Image built with success",
+		Type:    DDonePositive,
+	}, <-statuses)
+
 	mc.AssertExpectations(t)
 	wg.Wait()
 }