Simplify tests

Signed-off-by: Paschalis Tsilias <[email protected]>
open-telemetry · Jul 9, 2024 · d978455 · d978455
1 parent 5e01f57
commit d978455
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 77 deletions.
diff --git a/client/internal/httpsender_test.go b/client/internal/httpsender_test.go
@@ -224,49 +224,44 @@ func TestPackageUpdatesInParallel(t *testing.T) {
 		},
 	}
 
-	// Set the RequestInstanceUid flag on the tracked state to request the server for a new ID to use.
 	clientSyncedState := &ClientSyncedState{}
 	capabilities := protobufs.AgentCapabilities_AgentCapabilities_AcceptsPackages
 	sender.receiveProcessor = newReceivedProcessor(&sharedinternal.NopLogger{}, sender.callbacks, sender, clientSyncedState, localPackageState, capabilities, &mux)
 
-	go func() {
-		sender.receiveProcessor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{
-					Packages: map[string]*protobufs.PackageAvailable{
-						"package1": {
-							Type:    protobufs.PackageType_PackageType_TopLevel,
-							Version: "1.0.0",
-							File: &protobufs.DownloadableFile{
-								DownloadUrl: "foo",
-								ContentHash: []byte{4, 5},
-							},
-							Hash: []byte{1, 2, 3},
+	sender.receiveProcessor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{
+				Packages: map[string]*protobufs.PackageAvailable{
+					"package1": {
+						Type:    protobufs.PackageType_PackageType_TopLevel,
+						Version: "1.0.0",
+						File: &protobufs.DownloadableFile{
+							DownloadUrl: "foo",
+							ContentHash: []byte{4, 5},
 						},
+						Hash: []byte{1, 2, 3},
 					},
-					AllPackagesHash: []byte{1, 2, 3, 4, 5},
 				},
-			})
-	}()
-	go func() {
-		sender.receiveProcessor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{
-					Packages: map[string]*protobufs.PackageAvailable{
-						"package22": {
-							Type:    protobufs.PackageType_PackageType_TopLevel,
-							Version: "1.0.0",
-							File: &protobufs.DownloadableFile{
-								DownloadUrl: "bar",
-								ContentHash: []byte{4, 5},
-							},
-							Hash: []byte{1, 2, 3},
+				AllPackagesHash: []byte{1, 2, 3, 4, 5},
+			},
+		})
+	sender.receiveProcessor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{
+				Packages: map[string]*protobufs.PackageAvailable{
+					"package22": {
+						Type:    protobufs.PackageType_PackageType_TopLevel,
+						Version: "1.0.0",
+						File: &protobufs.DownloadableFile{
+							DownloadUrl: "bar",
+							ContentHash: []byte{4, 5},
 						},
+						Hash: []byte{1, 2, 3},
 					},
-					AllPackagesHash: []byte{1, 2, 3, 4, 5},
 				},
-			})
-	}()
+				AllPackagesHash: []byte{1, 2, 3, 4, 5},
+			},
+		})
 
 	assert.Eventually(t, func() bool {
 		return messages.Load() == 2
@@ -298,18 +293,14 @@ func TestPackageUpdatesWithError(t *testing.T) {
 	sender.receiveProcessor = newReceivedProcessor(&sharedinternal.NopLogger{}, sender.callbacks, sender, clientSyncedState, localPackageState, capabilities, &mux)
 
 	// Send two messages in parallel.
-	go func() {
-		sender.receiveProcessor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{},
-			})
-	}()
-	go func() {
-		sender.receiveProcessor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{},
-			})
-	}()
+	sender.receiveProcessor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{},
+		})
+	sender.receiveProcessor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{},
+		})
 
 	// Make sure that even though the call to Sync errored out early, the lock
 	// was still released properly for both messages to be processed.

diff --git a/client/internal/wsreceiver_test.go b/client/internal/wsreceiver_test.go
@@ -236,44 +236,40 @@ func TestWSPackageUpdatesInParallel(t *testing.T) {
 	sender := NewSender(&internal.NopLogger{})
 	receiver := NewWSReceiver(&internal.NopLogger{}, callbacks, nil, sender, clientSyncedState, localPackageState, capabilities, &mux)
 
-	go func() {
-		receiver.processor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{
-					Packages: map[string]*protobufs.PackageAvailable{
-						"package1": {
-							Type:    protobufs.PackageType_PackageType_TopLevel,
-							Version: "1.0.0",
-							File: &protobufs.DownloadableFile{
-								DownloadUrl: "foo",
-								ContentHash: []byte{4, 5},
-							},
-							Hash: []byte{1, 2, 3},
+	receiver.processor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{
+				Packages: map[string]*protobufs.PackageAvailable{
+					"package1": {
+						Type:    protobufs.PackageType_PackageType_TopLevel,
+						Version: "1.0.0",
+						File: &protobufs.DownloadableFile{
+							DownloadUrl: "foo",
+							ContentHash: []byte{4, 5},
 						},
+						Hash: []byte{1, 2, 3},
 					},
-					AllPackagesHash: []byte{1, 2, 3, 4, 5},
 				},
-			})
-	}()
-	go func() {
-		receiver.processor.ProcessReceivedMessage(ctx,
-			&protobufs.ServerToAgent{
-				PackagesAvailable: &protobufs.PackagesAvailable{
-					Packages: map[string]*protobufs.PackageAvailable{
-						"package22": {
-							Type:    protobufs.PackageType_PackageType_TopLevel,
-							Version: "1.0.0",
-							File: &protobufs.DownloadableFile{
-								DownloadUrl: "bar",
-								ContentHash: []byte{4, 5},
-							},
-							Hash: []byte{1, 2, 3},
+				AllPackagesHash: []byte{1, 2, 3, 4, 5},
+			},
+		})
+	receiver.processor.ProcessReceivedMessage(ctx,
+		&protobufs.ServerToAgent{
+			PackagesAvailable: &protobufs.PackagesAvailable{
+				Packages: map[string]*protobufs.PackageAvailable{
+					"package22": {
+						Type:    protobufs.PackageType_PackageType_TopLevel,
+						Version: "1.0.0",
+						File: &protobufs.DownloadableFile{
+							DownloadUrl: "bar",
+							ContentHash: []byte{4, 5},
 						},
+						Hash: []byte{1, 2, 3},
 					},
-					AllPackagesHash: []byte{1, 2, 3, 4, 5},
 				},
-			})
-	}()
+				AllPackagesHash: []byte{1, 2, 3, 4, 5},
+			},
+		})
 
 	assert.Eventually(t, func() bool {
 		return messages.Load() == 2