From: liuct <liuchengtao1982@gmail.com>
Date: Fri, 5 Sep 2014 12:37:10 +0000 (+0800)
Subject: fix core test issue: return code for app user
X-Git-Tag: upstream/3.1.7~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9477942d0d97a34975df4e1a5dfbfbc28c33e65;p=test%2Ftools%2Ftestkit-lite.git

fix core test issue: return code for app user
---

diff --git a/testkitlite/commodule/tizenivi.py b/testkitlite/commodule/tizenivi.py
index 7383b35..0ccd156 100644
--- a/testkitlite/commodule/tizenivi.py
+++ b/testkitlite/commodule/tizenivi.py
@@ -49,8 +49,8 @@ RPM_LIST = "ssh %s rpm -qa | grep tct"
 APP_QUERY_STR = "ssh %s \"ps aux |grep '%s'|grep -v grep\"|awk '{print $2}'"
 APP_KILL_STR = "ssh %s kill -9 %s"
 APP_NONBLOCK_STR = "ssh %s \"%s &\""
-SSH_COMMAND_RTN = "ssh %s \"%s; echo returncode=$?\""
-SSH_COMMAND_APP = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket; %s';echo returncode=$?\""
+SSH_COMMAND_RTN = "ssh %s \"%s\"; echo returncode=$?"
+SSH_COMMAND_APP = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket; %s'\";echo returncode=$?"
 
 # wrt-launcher constants
 WRT_MAIN = "wrt-launcher"
@@ -64,7 +64,7 @@ WRT_LOCATION = "/home/app/content/tct/opt/%s/%s.wgt"
 # crosswalk constants
 XWALK_MAIN = "xwalkctl"
 XWALK_QUERY_STR = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl' \"| grep -w %s | awk '{print $(NF-1)}'"
-XWALK_START_STR = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalk-launcher %s' & \""
+XWALK_START_STR = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;launch_app %s' & \""
 XWALK_INSTALL_STR = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl --install %s' \""
 XWALK_UNINSTL_STR = "ssh %s \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl --uninstall %s' \""
 XWALK_LOCATION = "/home/app/content/tct/opt/%s/%s.wgt"
diff --git a/testkitlite/commodule/tizenmobile.py b/testkitlite/commodule/tizenmobile.py
index bef6da2..462c367 100644
--- a/testkitlite/commodule/tizenmobile.py
+++ b/testkitlite/commodule/tizenmobile.py
@@ -42,7 +42,7 @@ APP_KILL_STR = "sdb -s %s shell kill -9 %s"
 APP_NONBLOCK_STR = "sdb -s %s shell '%s' &"
 SDB_COMMAND = "sdb -s %s shell '%s'"
 SDB_COMMAND_RTN = "sdb -s %s shell '%s; echo returncode=$?'"
-SDB_COMMAND_APP = "sdb -s %s shell \"su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;%s';echo returncode=$?\""
+SDB_COMMAND_APP = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;%s;echo returncode=$?'"
 
 
 # wrt-launcher constants
@@ -57,7 +57,7 @@ WRT_LOCATION = "/home/app/content/tct/opt/%s/%s.wgt"
 # crosswalk constants
 XWALK_MAIN = "xwalkctl"
 XWALK_QUERY_STR = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl' | grep -w %s | awk '{print $(NF-1)}'"
-XWALK_START_STR = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalk-launcher %s' &"
+XWALK_START_STR = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;launch_app %s' &"
 XWALK_INSTALL_STR = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl --install %s'"
 XWALK_UNINSTL_STR = "sdb -s %s shell su - app -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket;xwalkctl --uninstall %s'"
 XWALK_LOCATION = "/home/app/content/tct/opt/%s/%s.wgt"