Skip to content

Agent Mesh

fix(node): use background context in PubSub subscription loop and fix pubsub integration test

Antonio Ojeafcfded9b6c37
diff --git a/internal/node/node.go b/internal/node/node.go
index 7ba1ed69..ecfa157e 100644
--- a/internal/node/node.go
+++ b/internal/node/node.go
@@ -1275,7 +1275,7 @@ func (n *SamNode) subscribeToTopic(ctx context.Context, topicName string) error
logger.Infof("[PubSub] Exited subscription background loop for topic: %s", topicName)
}()
for {
- msg, err := sub.Next(ctx)
+ msg, err := sub.Next(context.Background())
if err != nil {
logger.Errorf("[PubSub] subscription Next() error for topic %s: %v", topicName, err)
return
diff --git a/tests/integration/pubsub_test.go b/tests/integration/pubsub_test.go
index 240ad159..eaee617c 100644
--- a/tests/integration/pubsub_test.go
+++ b/tests/integration/pubsub_test.go
@@ -39,7 +39,7 @@ func TestPubSubTools(t *testing.T) {
}
t.Logf("Node 2 logs at: %s/node2.log", tmpHome2)
- ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+ ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
// Start Node 1
@@ -139,28 +139,30 @@ func TestPubSubTools(t *testing.T) {
t.Logf("Node 2 address: %s", addr2)
callTool(mcpAddr1, "connect_peer", map[string]any{"peer_addr": addr2})
- // Node 1 broadcasts on topic "test-topic"
- broadcastResult := callTool(mcpAddr1, "mesh_pubsub_broadcast", map[string]any{
- "topic": "test-topic",
- "payload": "hello from node 1",
+ // Node 1 subscribes to topic "test-topic"
+ subscribeResult1 := callTool(mcpAddr1, "subscribe_topic", map[string]any{
+ "topic": "test-topic",
})
- if !strings.Contains(broadcastResult, "Published") {
- t.Fatalf("Broadcast failed: %s", broadcastResult)
+ if !strings.Contains(subscribeResult1, "Subscribed") {
+ t.Fatalf("Subscribe node 1 failed: %s", subscribeResult1)
}
// Node 2 subscribes to topic "test-topic"
- subscribeResult := callTool(mcpAddr2, "subscribe_topic", map[string]any{
+ subscribeResult2 := callTool(mcpAddr2, "subscribe_topic", map[string]any{
"topic": "test-topic",
})
- if !strings.Contains(subscribeResult, "Subscribed") {
- t.Fatalf("Subscribe failed: %s", subscribeResult)
+ if !strings.Contains(subscribeResult2, "Subscribed") {
+ t.Fatalf("Subscribe node 2 failed: %s", subscribeResult2)
}
+ // Allow mesh propagation
+ time.Sleep(300 * time.Millisecond)
+
var pollResult string
deadline := time.Now().Add(10 * time.Second)
for time.Now().Before(deadline) {
// Node 1 broadcasts on topic "test-topic" again to ensure delivery after subscription
- broadcastResult = callTool(mcpAddr1, "mesh_pubsub_broadcast", map[string]any{
+ broadcastResult := callTool(mcpAddr1, "mesh_pubsub_broadcast", map[string]any{
"topic": "test-topic",
"payload": "hello from node 1",
})