diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/attach.et | 3 | ||||
| -rw-r--r-- | test/discovery.et | 10 | ||||
| -rw-r--r-- | test/invite.et | 1 | ||||
| -rw-r--r-- | test/message.et | 3 | ||||
| -rw-r--r-- | test/network.et | 1 |
5 files changed, 18 insertions, 0 deletions
diff --git a/test/attach.et b/test/attach.et index f5a6906..cb0d448 100644 --- a/test/attach.et +++ b/test/attach.et @@ -101,6 +101,7 @@ test SyncAfterAttach: expect /create-identity-done ref $refpat.*/ from p3 send "start-server services $services_1" to p1 + expect /start-server-done/ from p1 for p in [ p2, p3 ]: with p: send "start-server services $services_1" @@ -121,6 +122,8 @@ test SyncAfterAttach: send "start-server services $services_d" to pd for p in [ p1, p2, p3 ]: send "start-server services $services_2" to p + expect /start-server-done/ from pd + expect /start-server-done/ from p1 # Shared identity sync after explicit direct connection diff --git a/test/discovery.et b/test/discovery.et index 9f2f06f..b8d5c81 100644 --- a/test/discovery.et +++ b/test/discovery.et @@ -31,6 +31,7 @@ test ManualDiscovery: for id in [ p1obase, p1base ]: for p in [ pd, p1, p2 ]: send "start-server services $services" to p + expect from pd /start-server-done/ for p in [ p1, p2 ]: with p: @@ -60,6 +61,7 @@ test ManualDiscovery: for id in [ p1obase ]: for p in [ pd, p1, p2 ]: send "start-server services $services" to p + expect from pd /start-server-done/ with p1: send "peer-add ${pd.node.ip}" @@ -120,6 +122,7 @@ test DiscoveryJoinedAfter: for id in [ p1obase ]: for p in [ pd, p1, p2 ]: send "start-server services $services" to p + expect from pd /start-server-done/ for p in [ p2 ]: with p: @@ -189,6 +192,7 @@ test DiscoveryTunnel: for id in [ p1obase ]: for p in [ pd, p1, p2 ]: send "start-server services $services test-log" to p + expect from pd /start-server-done/ for p in [ p1, p2 ]: with p: @@ -264,6 +268,8 @@ test DiscoveryTunnelWithChangedAddresses: for p in [ p1, p2 ]: send "start-server services $services test-log" to p + expect from pd /start-server-done/ + for p in [ p1, p2 ]: with p: send "peer-add ${pd.node.ip}" @@ -347,6 +353,7 @@ test DiscoveryTunnelRefused: for id in [ p1obase ]: for p in [ pd, p1, p2 ]: send "start-server services $services test-log" to p + expect from pd /start-server-done/ for p in [ p1, p2 ]: with p: @@ -411,6 +418,8 @@ test CommonOwnerDiscovery: for p in [ p1, p2, p3 ]: send "start-server services attach" to p + for p in [ p1, p2, p3 ]: + expect /start-server-done/ from p for p in [ p2, p3 ]: send "watch-local-identity" to p send "peer-add ${p1.node.ip} 29665" to p @@ -444,6 +453,7 @@ test CommonOwnerDiscovery: for p in [ pd, p1, p2, p3 ]: send "start-server services $services" to p + expect from pd /start-server-done/ send "peer-add ${pd.node.ip}" to p1 expect from pd /discovery-packet ${p1.node.ip} 29665 search $owner/ diff --git a/test/invite.et b/test/invite.et index 336a37b..49a9bb3 100644 --- a/test/invite.et +++ b/test/invite.et @@ -159,6 +159,7 @@ test InviteContactDiscovery: send "start-server services discovery" to pd send "start-server services $services" to p1 send "start-server services $services" to p2 + expect /start-server-done/ from pd for p in [ p1, p2 ]: with p: diff --git a/test/message.et b/test/message.et index eeef947..76cef74 100644 --- a/test/message.et +++ b/test/message.et @@ -208,6 +208,7 @@ test DirectMessageDiscovery: send "start-server services $services" for p in [ p2, p3, p4 ]: + expect /start-server-done/ from p with p1: send "peer-add ${p.node.ip}" expect: @@ -239,6 +240,7 @@ test DirectMessageDiscovery: for p in [ p1, p2, p3, p4, pd ]: with p: send "start-server services $services" + expect /start-server-done/ from pd for p in [ p2, p3, p4, p1 ]: with p: @@ -288,6 +290,7 @@ test DirectMessageDiscovery: for p in [ p1, p2, p3, p4, pd ]: with p: send "start-server services $services" + expect /start-server-done/ from pd for p in [ p2, p3, p4, p1 ]: with p: send "peer-add ${pd.node.ip}" diff --git a/test/network.et b/test/network.et index ead1354..f87e3d0 100644 --- a/test/network.et +++ b/test/network.et @@ -530,6 +530,7 @@ test ConnectToSelf: with p: expect /create-identity-done .*/ send "start-server" + expect /start-server-done/ # no peer should be added: send "peer-add ${p.node.ip}" |