From 332d1f45c056e23b342c653a423c968438984b7b Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Thu, 23 Apr 2009 10:53:32 +0000
Subject: [PATCH] running test with simulation delay to avoid test timeout
 while external ping process has not finished

---
 .../contiki_tests/ip_sky_telnet_ping.csc      | 56 +++++++++++--------
 .../contiki_tests/ip_sky_telnet_ping.info     |  2 +-
 .../cooja/contiki_tests/ip_sky_telnet_ping.js |  5 +-
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
index aa4f5345b..458413701 100644
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
+++ b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <simconf>
-  <project>../apps/mrm</project>
-  <project>../apps/mspsim</project>
-  <project>../apps/native_gateway</project>
   <simulation>
     <title>My simulation</title>
     <delaytime>0</delaytime>
@@ -24,7 +21,7 @@
       <commands>make sky-telnet-server.sky TARGET=sky</commands>
       <firmware>../../../examples/sky-ip/sky-telnet-server.sky</firmware>
       <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
-      <moteinterface>se.sics.cooja.mspmote.interfaces.MspIPAddress</moteinterface>
+      <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
       <moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
       <moteinterface>se.sics.cooja.mspmote.interfaces.MspClock</moteinterface>
       <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
@@ -49,23 +46,10 @@
       </interface_config>
     </mote>
   </simulation>
-  <plugin>
-    se.sics.cooja.plugins.LogListener
-    <plugin_config>
-      <filter />
-      <history>256</history>
-    </plugin_config>
-    <width>1024</width>
-    <z>1</z>
-    <height>209</height>
-    <location_x>0</location_x>
-    <location_y>446</location_y>
-    <minimized>false</minimized>
-  </plugin>
   <plugin>
     se.sics.cooja.plugins.SimControl
     <width>248</width>
-    <z>2</z>
+    <z>4</z>
     <height>200</height>
     <location_x>2</location_x>
     <location_y>2</location_y>
@@ -75,14 +59,42 @@
     se.sics.cooja.plugins.NativeIPGateway
     <mote_arg>0</mote_arg>
     <plugin_config>
-      <network_interface>\Device\NPF_{53CBA059-40AA-4822-BB53-7A5B9AFE77D6}</network_interface>
+      <network_interface>\Device\NPF_{6AE59250-8082-40D4-B2F4-89EC57DD3321}</network_interface>
       <register_routes>true</register_routes>
     </plugin_config>
     <width>388</width>
-    <z>0</z>
+    <z>2</z>
     <height>331</height>
-    <location_x>265</location_x>
-    <location_y>16</location_y>
+    <location_x>627</location_x>
+    <location_y>107</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.MoteInterfaceViewer
+    <mote_arg>0</mote_arg>
+    <plugin_config>
+      <interface>Serial port</interface>
+      <scrollpos>0,0</scrollpos>
+    </plugin_config>
+    <width>385</width>
+    <z>1</z>
+    <height>234</height>
+    <location_x>629</location_x>
+    <location_y>420</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>LEDs</skin>
+      <skin>Addresses: IP or Rime</skin>
+      <skin>Radio environment (UDGM)</skin>
+    </plugin_config>
+    <width>300</width>
+    <z>3</z>
+    <height>107</height>
+    <location_x>714</location_x>
+    <location_y>1</location_y>
     <minimized>false</minimized>
   </plugin>
 </simconf>
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.info b/tools/cooja/contiki_tests/ip_sky_telnet_ping.info
index 4c0d7090b..adfae68ca 100644
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.info
+++ b/tools/cooja/contiki_tests/ip_sky_telnet_ping.info
@@ -1 +1 @@
-1xSky node: examples/sky-ip/sky-telnet-server.c. Sends 10 pings to 172.16.1.0 via the native IP stack. Test succeeds if more than 5 ping replies are received. 
+1xSky node: examples/sky-ip/sky-telnet-server.c. Sends 10 pings to 172.16.1.0 via the native IP stack. Test succeeds if more than 5 ping replies are received.   
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.js b/tools/cooja/contiki_tests/ip_sky_telnet_ping.js
index d61940b9c..e963866a4 100644
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.js
+++ b/tools/cooja/contiki_tests/ip_sky_telnet_ping.js
@@ -1,4 +1,4 @@
-TIMEOUT(120000);
+TIMEOUT(30000);
 
 /* conf */
 nrReplies = 0;
@@ -14,6 +14,9 @@ replyMsg = "from " + ipAddress;
 /* mote startup */
 WAIT_UNTIL(msg.contains('Sky telnet process'));
 
+/* override simulation delay, test times out is too fast otherwise */
+mote.getSimulation().setDelayTime(1);
+
 /* start ping process */
 var runnableObj = new Object();
 runnableObj.run = function() {