Debug synchronization + add return code

13 files changed, 27 insertions, 17 deletions

diff --git a/tests/api_receivet0_eth0_1s1r/out b/tests/api_receivet0_eth0_1s1r/out
index b9f63cd..0116a1d 100644
--- a/tests/api_receivet0_eth0_1s1r/out
+++ b/tests/api_receivet0_eth0_1s1r/out
@@ -1,5 +1,5 @@
 [t=0.000,src=n0] Send 1 bytes to n1 on eth0
-[t=0.000,src=n1] Receive failed code=-1
+[t=0.000,src=n1] Receive failed code=RCode.TIMEOUT_EXPIRE
 [t=1.000,src=n1] Receive 1 bytes on eth0
 [t=1.000,src=n1] Received: Hello World!
 [t=1.000,src=esds] Simulation ends
diff --git a/tests/api_receivet0_eth0_1s1r/receiver.py b/tests/api_receivet0_eth0_1s1r/receiver.py
index e57c460..021b854 100644
--- a/tests/api_receivet0_eth0_1s1r/receiver.py
+++ b/tests/api_receivet0_eth0_1s1r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receivet(node,timeout):
     ##### Simple receive
     code, data=node.receivet("eth0",timeout)
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     node.log(msg)
 
 def execute(api):
diff --git a/tests/api_receivet_eth0_1s1r/out b/tests/api_receivet_eth0_1s1r/out
index 98756b5..3573164 100644
--- a/tests/api_receivet_eth0_1s1r/out
+++ b/tests/api_receivet_eth0_1s1r/out
@@ -2,7 +2,7 @@
 [t=1.000,src=n1] Receive 1 bytes on eth0
 [t=1.000,src=n1] Received: Hello World!
 [t=1.000,src=n0] Send 1 bytes to n1 on eth0
-[t=1.500,src=n1] Receive failed code=-1
+[t=1.500,src=n1] Receive failed code=RCode.TIMEOUT_EXPIRE
 [t=2.000,src=n1] Receive 1 bytes on eth0
 [t=2.000,src=n1] Received: Hello World!
 [t=2.000,src=esds] Simulation ends
diff --git a/tests/api_receivet_eth0_1s1r/receiver.py b/tests/api_receivet_eth0_1s1r/receiver.py
index 515ff6a..3869830 100644
--- a/tests/api_receivet_eth0_1s1r/receiver.py
+++ b/tests/api_receivet_eth0_1s1r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receivet(node,timeout):
     ##### Simple receive
     code, data=node.receivet("eth0",timeout)
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     node.log(msg)
 
 def execute(api):
diff --git a/tests/api_send0_eth0_1s1r/receiver.py b/tests/api_send0_eth0_1s1r/receiver.py
index 3f7a7db..26c070c 100644
--- a/tests/api_send0_eth0_1s1r/receiver.py
+++ b/tests/api_send0_eth0_1s1r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receive(api):
     ##### Simple receive
     code, data=api.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
 
 def execute(api):
@@ -16,7 +17,7 @@ def execute(api):
     receive(api)
     # Simulated time t=3s here
     code, data=api.receivet("eth0",0)
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     # Simulated time t=3s here
 
diff --git a/tests/api_send_eth0_1s1r/out b/tests/api_send_eth0_1s1r/out
index 8768500..d01fb93 100644
--- a/tests/api_send_eth0_1s1r/out
+++ b/tests/api_send_eth0_1s1r/out
@@ -7,7 +7,7 @@
 [t=3.000,src=n1] Received: Hello World!
 [t=3.000,src=n1] Turned off
 [t=4.000,src=n1] Turned on
-[t=5.000,src=n1] Receive failed code=-1
+[t=5.000,src=n1] Receive failed code=RCode.TIMEOUT_EXPIRE
 [t=18.000,src=n0] End transmission
 [t=18.000,src=n0] Send 15 bytes to n1 on eth0
 [t=33.000,src=n1] Receive 15 bytes on eth0
diff --git a/tests/api_send_eth0_1s1r/receiver.py b/tests/api_send_eth0_1s1r/receiver.py
index ae1169c..b1332af 100644
--- a/tests/api_send_eth0_1s1r/receiver.py
+++ b/tests/api_send_eth0_1s1r/receiver.py
@@ -1,21 +1,22 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def execute(api):
     ##### Simple receive
     code, data=api.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     ##### Test if we still receive the data when we are not receiving
     api.wait(2)
     code, data=api.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     ##### Ensure data is not receive when turned off but communication must still be ongoing
     api.turn_off()
     api.wait(1)
     api.turn_on()
     code, data=api.receivet("eth0",1)
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     ##### Ensure communication get aborted on turned off for the sender
     api.wait(28) # Goto t=33s
diff --git a/tests/api_send_eth0_2s1r/receiver.py b/tests/api_send_eth0_2s1r/receiver.py
index 2f268fd..b1b6b37 100644
--- a/tests/api_send_eth0_2s1r/receiver.py
+++ b/tests/api_send_eth0_2s1r/receiver.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def execute(api):
     ##### Simple receive from node 0
     code, data=api.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     
     ##### Simple receive from node 1
     code, data=api.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     api.log(msg)
     
diff --git a/tests/api_send_eth0_3s1r/receiver.py b/tests/api_send_eth0_3s1r/receiver.py
index 4516d7a..dfd85d8 100644
--- a/tests/api_send_eth0_3s1r/receiver.py
+++ b/tests/api_send_eth0_3s1r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receive(node, n):
     for i in range(0,n):
         code, data=node.receive("eth0")
-        msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+        msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
         node.log(msg)
 
 def execute(api):
diff --git a/tests/api_send_wlan0_1s2r/receiver.py b/tests/api_send_wlan0_1s2r/receiver.py
index 5b86500..048d57b 100644
--- a/tests/api_send_wlan0_1s2r/receiver.py
+++ b/tests/api_send_wlan0_1s2r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receive(node):
     ##### Simple receive
     code, data=node.receive("wlan0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     node.log(msg)
 
 
diff --git a/tests/api_sendt_eth0_1s1r/receiver.py b/tests/api_sendt_eth0_1s1r/receiver.py
index 0d8561e..256de6a 100644
--- a/tests/api_sendt_eth0_1s1r/receiver.py
+++ b/tests/api_sendt_eth0_1s1r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receive(node):
     ##### Simple receive
     code, data=node.receive("eth0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     node.log(msg)
 
 def execute(api):
diff --git a/tests/api_sendt_eth0_1s1r/sender.py b/tests/api_sendt_eth0_1s1r/sender.py
index c7fdb0d..1da11b1 100644
--- a/tests/api_sendt_eth0_1s1r/sender.py
+++ b/tests/api_sendt_eth0_1s1r/sender.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def sendt(node,timeout):
     code=node.sendt("eth0","Hello World!",1,1,timeout)
-    msg="Send worked!" if code == 0 else "Send failed"
+    msg="Send worked!" if code == RCode.SUCCESS else "Send failed"
     node.log(msg)
 
 def execute(api):
diff --git a/tests/api_sendt_wlan0_1s2r/receiver.py b/tests/api_sendt_wlan0_1s2r/receiver.py
index eca49ad..cd2b5c1 100644
--- a/tests/api_sendt_wlan0_1s2r/receiver.py
+++ b/tests/api_sendt_wlan0_1s2r/receiver.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from esds import RCode
 
 def receive(node):
     ##### Simple receive
     code, data=node.receive("wlan0")
-    msg="Received: "+data if code == 0 else "Receive failed code="+str(code)
+    msg="Received: "+data if code == RCode.SUCCESS else "Receive failed code="+str(code)
     node.log(msg)