[mobile][tct-messaging-email-tizen-tests][change path for supporting global user]

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

diff --git a/mobile/tct-messaging-email-tizen-tests/inst.wgt.py b/mobile/tct-messaging-email-tizen-tests/inst.wgt.py
index 6e037dfab3bbcf2b2945f4ec8fc39d114f835f3a..ea1c0dfa326bd5b92d10453f6f4dce8fe874ab39 100644 (file)
--- a/mobile/tct-messaging-email-tizen-tests/inst.wgt.py
+++ b/mobile/tct-messaging-email-tizen-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,8 +20,33 @@ 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 askpolicyremoving():
+    for root, dirs, files in os.walk(SCRIPT_DIR):
+        for file in files:
+            if file.endswith(".wgt"):
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
+   
+    print pkg_id
+    print (os.getcwd())
+    print (os.path.dirname(os.path.realpath(__file__)) )
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):
+        action_status = False
+    if PARAMETERS.mode == "SDB":
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, 
+        SRC_DIR, pkg_id)
+    return doCMD(cmd)
+       
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
     print "-->> \"%s\"" % cmd
@@ -41,7 +66,6 @@ def doCMD(cmd):
 
     return (cmd_return_code, output)
 
-
 def updateCMD(cmd=None):
     if "pkgcmd" in cmd:
         cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
@@ -56,8 +80,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -107,6 +129,9 @@ def doRemoteCopy(src=None, dest=None):
 def uninstPKGs():
     action_status = True
     for root, dirs, files in os.walk(SCRIPT_DIR):
+        if root.endswith("mediasrc"):
+            continue
+
         for file in files:
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
@@ -114,7 +139,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
@@ -139,12 +164,15 @@ def instPKGs():
     if return_code != 0:
         action_status = False
     for root, dirs, files in os.walk(SCRIPT_DIR):
+        if root.endswith("mediasrc"):
+            continue
+
         for file in files:
             if file.endswith(".wgt"):
                 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:
@@ -184,7 +212,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"
 
@@ -202,6 +230,8 @@ def main():
         print "No device provided"
         sys.exit(1)
 
+    userCheck()
+
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :
@@ -220,6 +250,7 @@ def main():
             sys.exit(1)
     else:
         if not instPKGs():
+            #askpolicyremoving()
             sys.exit(1)
 
 if __name__ == "__main__":

diff --git a/mobile/tct-messaging-email-tizen-tests/suite.json b/mobile/tct-messaging-email-tizen-tests/suite.json
index cc8aef99283776d08326f7a93b524d5684a36382..c04f483f7cc524e4a87862f07911417782220701 100644 (file)
--- a/mobile/tct-messaging-email-tizen-tests/suite.json
+++ b/mobile/tct-messaging-email-tizen-tests/suite.json
@@ -20,8 +20,8 @@
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },
-            "pkg-app": {\r
-                "sign-flag": "true"\r
+            "pkg-app": {
+                "sign-flag": "true"
             }
         },
         "apk-aio, cordova-aio": {
@@ -40,6 +40,7 @@
             ],
             "copylist": {
                 "inst.wgt.py": "inst.py",
+                "askpolicy.sh": "askpolicy.sh",
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },