From 2b7442a4c2452f8f3bd9e0f09f829478256d39af Mon Sep 17 00:00:00 2001
From: Dirk Huss <dirk_huss@mentor.com>
Date: Wed, 9 Dec 2015 14:50:34 +0100
Subject: vSomeIP 2.0.1

---
 .../conf/magic_cookies_test_client.json.in         |  4 +-
 .../conf/magic_cookies_test_service.json.in        |  2 +-
 .../magic_cookies_test_starter.sh                  | 65 ++--------------------
 3 files changed, 8 insertions(+), 63 deletions(-)

(limited to 'test')

diff --git a/test/magic_cookies_tests/conf/magic_cookies_test_client.json.in b/test/magic_cookies_tests/conf/magic_cookies_test_client.json.in
index c95370b..bcb2e29 100644
--- a/test/magic_cookies_tests/conf/magic_cookies_test_client.json.in
+++ b/test/magic_cookies_tests/conf/magic_cookies_test_client.json.in
@@ -1,5 +1,5 @@
 {
-    "unicast":"@TEST_IP_MASTER@",
+    "unicast":"@TEST_IP_SLAVE@",
     "netmask":"255.255.255.0",
     "logging":
     {
@@ -24,7 +24,7 @@
         {
             "service":"0x1234",
             "instance":"0x5678",
-            "unicast":"@TEST_IP_SLAVE@",
+            "unicast":"@TEST_IP_MASTER@",
             "reliable":
             {
                 "port":"30509",
diff --git a/test/magic_cookies_tests/conf/magic_cookies_test_service.json.in b/test/magic_cookies_tests/conf/magic_cookies_test_service.json.in
index 629c99e..0e53c24 100644
--- a/test/magic_cookies_tests/conf/magic_cookies_test_service.json.in
+++ b/test/magic_cookies_tests/conf/magic_cookies_test_service.json.in
@@ -1,5 +1,5 @@
 {
-    "unicast":"@TEST_IP_SLAVE@",
+    "unicast":"@TEST_IP_MASTER@",
     "logging":
     {
         "level":"debug",
diff --git a/test/magic_cookies_tests/magic_cookies_test_starter.sh b/test/magic_cookies_tests/magic_cookies_test_starter.sh
index ac97d61..e4308cd 100755
--- a/test/magic_cookies_tests/magic_cookies_test_starter.sh
+++ b/test/magic_cookies_tests/magic_cookies_test_starter.sh
@@ -10,81 +10,26 @@
 # the testcase simply executes this script. This script then runs client
 # and service and checks that both exit successfully.
 
-FAIL=0
-
-# Parameter 1: the pid to check
-# Parameter 2: number of TCP/UDP sockets the process should have open
-check_tcp_udp_sockets_are_open ()
-{
-    # Check that the passed pid/process does listen on at least one TCP/UDP socket 
-    # awk is used to avoid the case when a inode number is the same as a PID. The awk
-    # program filters the netstat output down to the protocol (1st field) and 
-    # the PID/Program name (last field) fields.
-    SERVICE_SOCKETS_LISTENING=$(netstat -tulpen 2> /dev/null | awk '{print $1 "\t"  $NF}' | grep $1 | wc -l)
-    if [ $SERVICE_SOCKETS_LISTENING -lt $2 ]
-    then
-        ((FAIL+=1))
-    fi
-}
-
-# Parameter 1: the pid to check
-check_tcp_udp_sockets_are_closed ()
-{
-    # Check that the passed pid/process does not listen on any TCP/UDP socket 
-    # or has any active connection via a TCP/UDP socket
-    # awk is used to avoid the case when a inode number is the same as a PID. The awk
-    # program filters the netstat output down to the protocol (1st field) and 
-    # the PID/Program name (last field) fields.
-    SERVICE_SOCKETS_LISTENING=$(netstat -tulpen 2> /dev/null | awk '{print $1 "\t"  $NF}' | grep $1 | wc -l)
-    if [ $SERVICE_SOCKETS_LISTENING -ne 0 ]
-    then
-        ((FAIL+=1))
-    fi
-
-    SERVICE_SOCKETS_CONNECTED=$(netstat -tupen 2> /dev/null | awk '{print $1 "\t"  $NF}' | grep $1 | wc -l)
-    if [ $SERVICE_SOCKETS_CONNECTED -ne 0 ]
-    then
-        ((FAIL+=1))
-    fi
-}
-
 # Display a message to show the user that he must now call the external service
 # to finish the test successfully
 cat <<End-of-message
 *******************************************************************************
 *******************************************************************************
 ** Please now run:
-** magic_cookies_test_service_start.sh
+** magic_cookies_test_client_start.sh
 ** from an external host to successfully complete this test.
 **
 ** You probably will need to adapt the 'unicast' settings in
 ** magic_cookies_client.json and
 ** magic_cookies_service.json to your personal setup.
 ** 
-** As soon as the service is started please press <RETURN> to continue the test
 *******************************************************************************
 *******************************************************************************
 End-of-message
-read
 
 # Start the client for magic-cookies test
-export VSOMEIP_APPLICATION_NAME=magic_cookies_test_client
-export VSOMEIP_CONFIGURATION=magic_cookies_test_client.json
-./magic_cookies_test_client &
-CLIENT_PID=$!
-
-# Wait until client is finished
-for job in $(jobs -p)
-do
-    # Fail gets incremented if either client or service exit
-    # with a non-zero exit code
-    wait $job || ((FAIL+=1))
-done
+export VSOMEIP_APPLICATION_NAME=magic_cookies_test_service
+export VSOMEIP_CONFIGURATION=magic_cookies_test_service.json
+./magic_cookies_test_service  --tcp --static-routing
 
-# Check if server exited successfully
-if [ $FAIL -eq 0 ]
-then
-    exit 0
-else
-    exit 1
-fi
+exit $?
-- 
cgit v1.2.1