Discovery: track our search requests per peer

1 files changed, 64 insertions, 0 deletions

diff --git a/test/discovery.et b/test/discovery.et
index 98043b9..ef5bbd4 100644
--- a/test/discovery.et
+++ b/test/discovery.et
@@ -92,6 +92,70 @@ test ManualDiscovery:
             expect /stop-server-done/ from p
 
 
+test DiscoveryJoinedAfter:
+    let services = "discovery"
+
+    subnet sd
+    subnet s1
+    subnet s2
+
+    spawn as pd on sd
+    spawn as p1 on s1
+    spawn as p2 on s2
+    send "create-identity Discovery" to pd
+    send "create-identity Device1 Owner1" to p1
+    send "create-identity Device2 Owner2" to p2
+
+    expect /create-identity-done ref ($refpat).*/ from p1 capture p1id
+    send "identity-info $p1id" to p1
+    expect /identity-info ref $p1id base ($refpat) owner ($refpat).*/ from p1 capture p1base, p1owner
+    send "identity-info $p1owner" to p1
+    expect /identity-info ref $p1owner base ($refpat).*/ from p1 capture p1obase
+
+    expect /create-identity-done ref $refpat.*/ from p2
+    expect /create-identity-done ref $refpat.*/ from pd
+
+    for id in [ p1obase ]:
+        for p in [ pd, p1, p2 ]:
+            send "start-server services $services" to p
+
+        for p in [ p2 ]:
+            with p:
+                send "peer-add ${pd.node.ip}"
+                expect:
+                    /peer 1 addr ${pd.node.ip} 29665/
+                    /peer 1 id Discovery/
+            expect from pd:
+                    /peer [12] addr ${p.node.ip} 29665/
+                    /peer [12] id Device. Owner./
+
+        send "discovery-connect $id" to p2
+
+        for p in [ p1 ]:
+            with p:
+                send "peer-add ${pd.node.ip}"
+                expect:
+                    /peer 1 addr ${pd.node.ip} 29665/
+                    /peer 1 id Discovery/
+            expect from pd:
+                    /peer [12] addr ${p.node.ip} 29665/
+                    /peer [12] id Device. Owner./
+
+        send "discovery-connect $id" to p2
+
+        expect from p1:
+            /peer [0-9]+ addr ${p2.node.ip} 29665/
+            /peer [0-9]+ id Device2 Owner2/
+        expect from p2:
+            /peer [0-9]+ addr ${p1.node.ip} 29665/
+            /peer [0-9]+ id Device1 Owner1/
+
+        for p in [ pd, p1, p2 ]:
+            send "stop-server" to p
+        for p in [ pd, p1, p2 ]:
+            expect /stop-server-done/ from p
+
+
 test DiscoveryTunnel:
     let services = "discovery:tunnel"