[common][tct-video-html5-tests][change path for supporting global user]

Change-Id: I2c5bf2b7c927206b93c4fe1c5108bc689336ede5
Signed-off-by: wxch <xiaochn.wang@samsung.com>

diff --git a/common/tct-video-html5-tests/inst.wgt.py b/common/tct-video-html5-tests/inst.wgt.py
index 5b1718da169ebc796a16962b47a209f160af24d9..d7b962bfa82776fca71e2303a49cf948e5f9ffac 100755 (executable)
--- a/common/tct-video-html5-tests/inst.wgt.py
+++ b/common/tct-video-html5-tests/inst.wgt.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 import string
-from optparse import OptionParser, make_option\r
+from optparse import OptionParser, make_option
 import ConfigParser
 
 
@@ -20,6 +20,15 @@ tct_parser = ConfigParser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')
+
+def userCheck():
+    global GLOVAL_OPT
+    if ADMIN_USER_30 == EXECUTION_MODE_30:
+        GLOVAL_OPT="--global"
+    else:
+        GLOVAL_OPT=""
 
 
 def doCMD(cmd):
@@ -55,8 +64,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -116,7 +123,7 @@ def uninstPKGs():
                     action_status = False
                     continue
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
                 for line in output:
                     if "Failure" in line:
                         action_status = False
@@ -145,7 +152,7 @@ def instPKGs():
                 if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
                     action_status = False
                 (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))
                 doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
                 for line in output:
                     if "Failure" in line:
@@ -187,7 +194,7 @@ def main():
         sys.exit(1)
 
     if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
+        PARAMETERS.user = EXECUTION_MODE_30
     if not PARAMETERS.mode:
         PARAMETERS.mode = "SDB"
 
@@ -205,6 +212,8 @@ def main():
         print "No device provided"
         sys.exit(1)
 
+    userCheck()
+
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :

diff --git a/common/tct-video-html5-tests/tests.xml b/common/tct-video-html5-tests/tests.xml
index 03719b8f391afecafb833f1e0af9b93cef450fdf..f67c4b536b32c63359bc6142892249e18efdd412 100755 (executable)
--- a/common/tct-video-html5-tests/tests.xml
+++ b/common/tct-video-html5-tests/tests.xml
@@ -143,7 +143,7 @@
           <test_script_entry test_script_expected_result="0">/opt/tct-video-html5-tests/video/w3c/canPlayType_bogus_type.html</test_script_entry>
         </description>
         </testcase>
-      <testcase component="W3C_HTML5 APIs/Media/HTML5 The video element (Partial)" execution_type="auto" id="video_loop_base" onload_delay="15" purpose="Check that the seeking event is triggered more than once  if the video.loop is set to true">
+      <testcase component="W3C_HTML5 APIs/Media/HTML5 The video element (Partial)" execution_type="auto" id="video_loop_base" onload_delay="30" purpose="Check that the seeking event is triggered more than once  if the video.loop is set to true">
         <description>
           <test_script_entry>/opt/tct-video-html5-tests/video/w3c/video_loop_base.html</test_script_entry>
         </description>
@@ -1353,7 +1353,7 @@
           <test_script_entry>/opt/tct-video-html5-tests/video/video_onemptied_event.html</test_script_entry>
         </description>
       </testcase>
-      <testcase component="W3C_HTML5 APIs/Media/HTML5 The video element" execution_type="auto" id="video_onended_event" purpose="Check if the event video.onended occurs when media resource is end">
+      <testcase component="W3C_HTML5 APIs/Media/HTML5 The video element" execution_type="auto" id="video_onended_event" onload_delay ="30" purpose="Check if the event video.onended occurs when media resource is end">
         <description>
           <test_script_entry>/opt/tct-video-html5-tests/video/video_onended_event.html</test_script_entry>
         </description>