From da8cac9853fade3c2835fc0fb946ae0951a57a4a Mon Sep 17 00:00:00 2001 From: "w.gu" Date: Fri, 20 Jan 2017 16:34:50 +0800 Subject: [PATCH] [common][multicolumn][change path for supporting global user] Change-Id: I0b1dadd00e252c5ae957ad7edab7bf7d41f49c1c Signed-off-by: w.gu --- common/tct-multicolumn-css3-tests/inst.wgt.py | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/common/tct-multicolumn-css3-tests/inst.wgt.py b/common/tct-multicolumn-css3-tests/inst.wgt.py index 5b1718da1..c7f89fd44 100755 --- a/common/tct-multicolumn-css3-tests/inst.wgt.py +++ b/common/tct-multicolumn-css3-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,7 +20,16 @@ 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): # Do not need handle timeout in this short script, let tool do it @@ -116,7 +125,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 +154,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 +196,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" @@ -204,7 +213,9 @@ def main(): if not PARAMETERS.device: print "No device provided" sys.exit(1) - + + userCheck() + user_info = getUSERID() re_code = user_info[0] if re_code == 0 : -- 2.34.1