summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--attach.test18
-rw-r--r--discovery.test10
-rw-r--r--sync.test18
3 files changed, 27 insertions, 19 deletions
diff --git a/attach.test b/attach.test
index 4e2238e..7115b55 100644
--- a/attach.test
+++ b/attach.test
@@ -7,19 +7,23 @@ test:
send "watch-local-identity" to p2
send "start-server" to p1
send "start-server" to p2
- expect /local-identity Device1 Owner/ from p1
- expect /local-identity Device2/ from p2
- expect /peer [0-9]+ 192.168.0.12:29665/ from p1
- expect /peer [0-9]+ 192.168.0.11:29665/ from p2
- expect /peer [0-9]+ Device2 Device2/ from p1
- expect /peer [0-9]+ Owner Device1/ from p2
+ expect from p1:
+ /local-identity Device1 Owner/
+ /peer 1 addr 192.168.0.12 29665/
+ /peer 1 id Device2/
+ expect from p2:
+ /local-identity Device2/
+ /peer 1 addr 192.168.0.11 29665/
+ /peer 1 id Device1 Owner/
+
send "attach Owner" to p2
expect /attach-confirm .*/ from p1
expect /attach-confirm .*/ from p2
# TODO: check code match
+
send "attach-accept Device2 1" to p1
send "attach-accept Owner 1" to p2
expect /attach-result Device2 1/ from p1
expect /attach-result Owner 1/ from p2
expect /local-identity Device2 Owner/ from p2
- expect /peer [0-9]+ Owner Device2/ from p1
+ expect /peer 1 id Device2 Owner/ from p1
diff --git a/discovery.test b/discovery.test
index aba6b15..60db1dc 100644
--- a/discovery.test
+++ b/discovery.test
@@ -5,7 +5,9 @@ test:
send "create-identity Device2" to p2
send "start-server" to p1
send "start-server" to p2
- expect /peer [0-9]+ 192.168.0.12:29665/ from p1
- expect /peer [0-9]+ 192.168.0.11:29665/ from p2
- expect /peer [0-9]+ Device2 Device2/ from p1
- expect /peer [0-9]+ Device1 Device1/ from p2
+ expect from p1:
+ /peer 1 addr 192.168.0.12 29665/
+ /peer 1 id Device2/
+ expect from p2:
+ /peer 1 addr 192.168.0.11 29665/
+ /peer 1 id Device1/
diff --git a/sync.test b/sync.test
index 2480ce9..8cf5b4d 100644
--- a/sync.test
+++ b/sync.test
@@ -9,13 +9,15 @@ test:
send "create-identity Device2" to p2
send "start-server" to p1
send "start-server" to p2
- expect /local-identity Device1 Owner/ from p1
- expect /local-identity Device2/ from p2
- expect /shared-identity Owner/ from p1
- expect /peer [0-9]+ 192.168.0.12:29665/ from p1
- expect /peer [0-9]+ 192.168.0.11:29665/ from p2
- expect /peer [0-9]+ Device2 Device2/ from p1
- expect /peer [0-9]+ Owner Device1/ from p2
+ expect from p1:
+ /local-identity Device1 Owner/
+ /shared-identity Owner/
+ /peer 1 addr 192.168.0.12 29665/
+ /peer 1 id Device2/
+ expect from p2:
+ /local-identity Device2/
+ /peer 1 addr 192.168.0.11 29665/
+ /peer 1 id Device1 Owner/
send "attach Owner" to p2
expect /attach-confirm .*/ from p1
@@ -28,7 +30,7 @@ test:
expect /attach-result Owner 1/ from p2
expect /local-identity Device2 Owner/ from p2
expect /shared-identity Owner/ from p2
- expect /peer [0-9]+ Owner Device2/ from p1
+ expect /peer 1 id Device2 Owner/ from p1
send "update-shared-identity NewOwner" to p1
expect /shared-identity NewOwner/ from p1