From: wxch <xiaochn.wang@samsung.com>
Date: Sat, 21 Jan 2017 07:59:03 +0000 (+0800)
Subject: [mobile][tct-callhistory-tizen-tests][change path for supporting global user]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f107a77bd30817cd71e130385695b7917e89c0fb;p=test%2Ftct%2Fweb%2Fapi.git

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

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

diff --git a/mobile/tct-callhistory-tizen-tests/inst.wgt.py b/mobile/tct-callhistory-tizen-tests/inst.wgt.py
index 5b1718da1..ef38eb600 100644
--- a/mobile/tct-callhistory-tizen-tests/inst.wgt.py
+++ b/mobile/tct-callhistory-tizen-tests/inst.wgt.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 import string
-from optparse import OptionParser, make_option
+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
@@ -55,8 +80,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -116,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
@@ -145,7 +168,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 +210,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 +228,8 @@ def main():
         print "No device provided"
         sys.exit(1)
 
+    userCheck()
+
     user_info = getUSERID()
     re_code = user_info[0]
     if re_code == 0 :
@@ -223,6 +248,7 @@ def main():
             sys.exit(1)
     else:
         if not instPKGs():
+            #askpolicyremoving()
             sys.exit(1)
 
 if __name__ == "__main__":
diff --git a/mobile/tct-callhistory-tizen-tests/suite.json b/mobile/tct-callhistory-tizen-tests/suite.json
index e9a70bf7a..567bd3174 100644
--- a/mobile/tct-callhistory-tizen-tests/suite.json
+++ b/mobile/tct-callhistory-tizen-tests/suite.json
@@ -20,8 +20,8 @@
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },
-            "pkg-app": {
-                "sign-flag": "true"
+            "pkg-app": {
+                "sign-flag": "true"
             }
         },
         "apk-aio, cordova-aio": {
@@ -46,6 +46,7 @@
             ],
             "copylist": {
                 "inst.xpk.py": "inst.py",
+                "askpolicy.sh": "askpolicy.sh",
                 "tests.full.xml": "tests.full.xml",
                 "tests.xml": "tests.xml"
             },