From: mengli.zhang Date: Fri, 20 Jan 2017 15:00:21 +0000 (-0500) Subject: [mobile][contact][change path for supporting global user] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=672ffda71195d6a12855422f6762093d81948d2a;p=test%2Ftct%2Fweb%2Fapi.git [mobile][contact][change path for supporting global user] Signed-off-by: mengli.zhang Change-Id: Ibd7635576fb3c94d7f15d5ced7dd8d4658282905 --- diff --git a/mobile/tct-contact-tizen-tests/askpolicy.sh b/mobile/tct-contact-tizen-tests/askpolicy.sh new file mode 100755 index 000000000..1c39bddfb --- /dev/null +++ b/mobile/tct-contact-tizen-tests/askpolicy.sh @@ -0,0 +1,10 @@ +#!/bin/bash +PATH=/bin:/usr/bin:/sbin:/usr/sbin +for i in `grep -r "0xA" /var/cynara/db/_ | grep $1` +do + CLIENT=`echo $i | cut -d ";" -f1` + USER=`echo $i | cut -d ";" -f2` + PRIVILEGE=`echo $i | cut -d ";" -f3` + #echo "cyad --erase=\"\" -r=no -c $CLIENT -u $USER -p $PRIVILEGE" + cyad --erase="" -r=no -c $CLIENT -u $USER -p $PRIVILEGE +done diff --git a/mobile/tct-contact-tizen-tests/inst.wgt.py b/mobile/tct-contact-tizen-tests/inst.wgt.py index b21ccb976..f04d84498 100644 --- a/mobile/tct-contact-tizen-tests/inst.wgt.py +++ b/mobile/tct-contact-tizen-tests/inst.wgt.py @@ -20,8 +20,32 @@ 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 @@ -114,7 +138,7 @@ def uninstPKGs(): action_status = False continue (return_code, output) = doRemoteCMD( - "pkgcmd -u -t wgt -q -n %s" % pkg_id) + "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id)) for line in output: if "Failure" in line: action_status = False @@ -140,7 +164,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: @@ -180,7 +204,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" @@ -198,6 +222,8 @@ def main(): print "No device provided" sys.exit(1) + userCheck() + user_info = getUSERID() re_code = user_info[0] if re_code == 0 : @@ -216,6 +242,7 @@ def main(): sys.exit(1) else: if not instPKGs(): + #askpolicyremoving() sys.exit(1) if __name__ == "__main__":