api update to python3X

Change-Id: Icbc8514554307cc69486abde9efc27050a494b0c
Signed-off-by: chen <chen89.chen@samsung.com>

diff --git a/common/tct-2dtransforms-css3-tests/inst.apk.py b/common/tct-2dtransforms-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/common/tct-2dtransforms-css3-tests/inst.apk.py
+++ b/common/tct-2dtransforms-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-2dtransforms-css3-tests/inst.wgt.py b/common/tct-2dtransforms-css3-tests/inst.wgt.py
index c7f89fd44607b570bbcae5447b935557cf8e590b..909755af3b4e03918ae3823bc036ddf994a43999 100755 (executable)
--- a/common/tct-2dtransforms-css3-tests/inst.wgt.py
+++ b/common/tct-2dtransforms-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-2dtransforms-css3-tests/inst.xpk.py b/common/tct-2dtransforms-css3-tests/inst.xpk.py
index bbc0c85581a68f5f5301d6d08108fc5d52aec1dc..ace8cbba96610eaf7e44d169716ce4fc3b921873 100755 (executable)
--- a/common/tct-2dtransforms-css3-tests/inst.xpk.py
+++ b/common/tct-2dtransforms-css3-tests/inst.xpk.py
@@ -8,6 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -15,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -23,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -182,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -202,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -212,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-2dtransforms-css3-tests/pack.py b/common/tct-2dtransforms-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-2dtransforms-css3-tests/pack.py
+++ b/common/tct-2dtransforms-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-3dtransforms-css3-tests/inst.apk.py b/common/tct-3dtransforms-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-3dtransforms-css3-tests/inst.apk.py
+++ b/common/tct-3dtransforms-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-3dtransforms-css3-tests/inst.wgt.py b/common/tct-3dtransforms-css3-tests/inst.wgt.py
index 7e3caa6c37e5ece07ffd4a4d06e7dce5ed8dc929..b88c1fccf124a302d1e7f6c29dc86f24109e53b9 100755 (executable)
--- a/common/tct-3dtransforms-css3-tests/inst.wgt.py
+++ b/common/tct-3dtransforms-css3-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-3dtransforms-css3-tests/inst.xpk.py b/common/tct-3dtransforms-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-3dtransforms-css3-tests/inst.xpk.py
+++ b/common/tct-3dtransforms-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-3dtransforms-css3-tests/pack.py b/common/tct-3dtransforms-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-3dtransforms-css3-tests/pack.py
+++ b/common/tct-3dtransforms-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-ResponsiveImage-w3c-tests/inst.apk.py b/common/tct-ResponsiveImage-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-ResponsiveImage-w3c-tests/inst.apk.py
+++ b/common/tct-ResponsiveImage-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ResponsiveImage-w3c-tests/inst.wgt.py b/common/tct-ResponsiveImage-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-ResponsiveImage-w3c-tests/inst.wgt.py
+++ b/common/tct-ResponsiveImage-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ResponsiveImage-w3c-tests/inst.xpk.py b/common/tct-ResponsiveImage-w3c-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-ResponsiveImage-w3c-tests/inst.xpk.py
+++ b/common/tct-ResponsiveImage-w3c-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ResponsiveImage-w3c-tests/pack.py b/common/tct-ResponsiveImage-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-ResponsiveImage-w3c-tests/pack.py
+++ b/common/tct-ResponsiveImage-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-account-tizen-tests/inst.apk.py b/common/tct-account-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-account-tizen-tests/inst.apk.py
+++ b/common/tct-account-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-account-tizen-tests/inst.wgt.py b/common/tct-account-tizen-tests/inst.wgt.py
index 2316502f49110c5656326bade9353be9d7932cdd..5ec20dc07083a6e42eff190ec7936a3ab7b5cba7 100755 (executable)
--- a/common/tct-account-tizen-tests/inst.wgt.py
+++ b/common/tct-account-tizen-tests/inst.wgt.py
@@ -1,257 +1,257 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-account-tizen-tests/inst.xpk.py b/common/tct-account-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-account-tizen-tests/inst.xpk.py
+++ b/common/tct-account-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-account-tizen-tests/pack.py b/common/tct-account-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-account-tizen-tests/pack.py
+++ b/common/tct-account-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-alarm-tizen-tests/inst.apk.py b/common/tct-alarm-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-alarm-tizen-tests/inst.apk.py
+++ b/common/tct-alarm-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-alarm-tizen-tests/inst.wgt.py b/common/tct-alarm-tizen-tests/inst.wgt.py
index 7f7d2c9d3fea0a314729b4046bc22de215f853d8..a928420d12014eb115c2ee4d800192695af65147 100755 (executable)
--- a/common/tct-alarm-tizen-tests/inst.wgt.py
+++ b/common/tct-alarm-tizen-tests/inst.wgt.py
@@ -1,245 +1,245 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-
-    for pkg_name in ["tct-alarm-tizen-tests", "alarmTestApp"]:
-        pkg_id = getPKGID(pkg_name)
-        if not pkg_id:
-            action_status = False
-            continue
-        (return_code, output) = doRemoteCMD("pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-        for line in output:
-            if "Failure" in line:
-                action_status = False
-                break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/Images" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/Sounds" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/Images" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("%s/*.jpg" % SCRIPT_DIR, "%s/Images" % SRC_DIR):
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/Sounds" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("%s/*.mp3" % SCRIPT_DIR, "%s/Sounds" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+\r
+    for pkg_name in ["tct-alarm-tizen-tests", "alarmTestApp"]:\r
+        pkg_id = getPKGID(pkg_name)\r
+        if not pkg_id:\r
+            action_status = False\r
+            continue\r
+        (return_code, output) = doRemoteCMD("pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+        for line in output:\r
+            if "Failure" in line:\r
+                action_status = False\r
+                break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/Images" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/Sounds" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/Images" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("%s/*.jpg" % SCRIPT_DIR, "%s/Images" % SRC_DIR):\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/Sounds" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("%s/*.mp3" % SCRIPT_DIR, "%s/Sounds" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-alarm-tizen-tests/inst.xpk.py b/common/tct-alarm-tizen-tests/inst.xpk.py
index c0c358eccbe00400cf69651e2937542462b771d2..34a9d92c36c7de32dda454d634bc849fdea0cc0d 100755 (executable)
--- a/common/tct-alarm-tizen-tests/inst.xpk.py
+++ b/common/tct-alarm-tizen-tests/inst.xpk.py
@@ -1,214 +1,214 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-alarm-tizen-tests/pack.py b/common/tct-alarm-tizen-tests/pack.py
index 08d55aafea37b74455bc394308459ede3844bb7c..92866ab2ed6acacf72d8704056c4c25f4835332a 100755 (executable)
--- a/common/tct-alarm-tizen-tests/pack.py
+++ b/common/tct-alarm-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-animations-css3-tests/inst.apk.py b/common/tct-animations-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-animations-css3-tests/inst.apk.py
+++ b/common/tct-animations-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animations-css3-tests/inst.wgt.py b/common/tct-animations-css3-tests/inst.wgt.py
index 7e3caa6c37e5ece07ffd4a4d06e7dce5ed8dc929..b88c1fccf124a302d1e7f6c29dc86f24109e53b9 100755 (executable)
--- a/common/tct-animations-css3-tests/inst.wgt.py
+++ b/common/tct-animations-css3-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animations-css3-tests/inst.xpk.py b/common/tct-animations-css3-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-animations-css3-tests/inst.xpk.py
+++ b/common/tct-animations-css3-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animations-css3-tests/pack.py b/common/tct-animations-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-animations-css3-tests/pack.py
+++ b/common/tct-animations-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-animationtiming-w3c-tests/inst.apk.py b/common/tct-animationtiming-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-animationtiming-w3c-tests/inst.apk.py
+++ b/common/tct-animationtiming-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animationtiming-w3c-tests/inst.wgt.py b/common/tct-animationtiming-w3c-tests/inst.wgt.py
index 7e3caa6c37e5ece07ffd4a4d06e7dce5ed8dc929..b88c1fccf124a302d1e7f6c29dc86f24109e53b9 100755 (executable)
--- a/common/tct-animationtiming-w3c-tests/inst.wgt.py
+++ b/common/tct-animationtiming-w3c-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animationtiming-w3c-tests/inst.xpk.py b/common/tct-animationtiming-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-animationtiming-w3c-tests/inst.xpk.py
+++ b/common/tct-animationtiming-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-animationtiming-w3c-tests/pack.py b/common/tct-animationtiming-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-animationtiming-w3c-tests/pack.py
+++ b/common/tct-animationtiming-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-appcache-html5-tests/inst.apk.py b/common/tct-appcache-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-appcache-html5-tests/inst.apk.py
+++ b/common/tct-appcache-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-appcache-html5-tests/inst.wgt.py b/common/tct-appcache-html5-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-appcache-html5-tests/inst.wgt.py
+++ b/common/tct-appcache-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-appcache-html5-tests/inst.xpk.py b/common/tct-appcache-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-appcache-html5-tests/inst.xpk.py
+++ b/common/tct-appcache-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-appcache-html5-tests/pack.py b/common/tct-appcache-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-appcache-html5-tests/pack.py
+++ b/common/tct-appcache-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-appcontrol-tizen-tests/inst.apk.py b/common/tct-appcontrol-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-appcontrol-tizen-tests/inst.apk.py
+++ b/common/tct-appcontrol-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-appcontrol-tizen-tests/inst.wgt.py b/common/tct-appcontrol-tizen-tests/inst.wgt.py
index 8b44f9c8d2dc1ed2572a8639dc42097f87fb041d..b72850d63dbd293fed9df13eaab0dd8c4298025b 100755 (executable)
--- a/common/tct-appcontrol-tizen-tests/inst.wgt.py
+++ b/common/tct-appcontrol-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-appcontrol-tizen-tests/inst.xpk.py b/common/tct-appcontrol-tizen-tests/inst.xpk.py
index 2b5e3f2e1645d072aa408f8ea5bac2e434f728a8..e4dff9a998e7a9f87bc6a29db288780b831fbb13 100755 (executable)
--- a/common/tct-appcontrol-tizen-tests/inst.xpk.py
+++ b/common/tct-appcontrol-tizen-tests/inst.xpk.py
@@ -1,227 +1,227 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    for item in os.listdir(SCRIPT_DIR):
-        if item.find("webapi-tizen-appcontrol-test_") != -1:
-            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    for item in os.listdir(SCRIPT_DIR):\r
+        if item.find("webapi-tizen-appcontrol-test_") != -1:\r
+            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-appcontrol-tizen-tests/pack.py b/common/tct-appcontrol-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-appcontrol-tizen-tests/pack.py
+++ b/common/tct-appcontrol-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-application-tizen-tests/inst.apk.py b/common/tct-application-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-application-tizen-tests/inst.apk.py
+++ b/common/tct-application-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-application-tizen-tests/inst.wgt.py b/common/tct-application-tizen-tests/inst.wgt.py
index 9e0c931c314f52699c738d27c3315abdaf7256e6..4baa95007d2fe09f7ee306b4964549df603686ba 100755 (executable)
--- a/common/tct-application-tizen-tests/inst.wgt.py
+++ b/common/tct-application-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -190,8 +190,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -210,7 +210,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -222,10 +222,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-application-tizen-tests/inst.xpk.py b/common/tct-application-tizen-tests/inst.xpk.py
index 371cc3088b64a6bf329cda62ffbeea6f445c9932..9a9a8f4e39b8c71aac5872e950809d105dabc930 100755 (executable)
--- a/common/tct-application-tizen-tests/inst.xpk.py
+++ b/common/tct-application-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -181,8 +181,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -201,7 +201,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -211,10 +211,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-application-tizen-tests/pack.py b/common/tct-application-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-application-tizen-tests/pack.py
+++ b/common/tct-application-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-archive-tizen-tests/inst.apk.py b/common/tct-archive-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-archive-tizen-tests/inst.apk.py
+++ b/common/tct-archive-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-archive-tizen-tests/inst.wgt.py b/common/tct-archive-tizen-tests/inst.wgt.py
index b8776ee4956365e7c913402066ad636156c7a260..a20ec241c89085a179a3b5a7c697b1f3ce72b08e 100755 (executable)
--- a/common/tct-archive-tizen-tests/inst.wgt.py
+++ b/common/tct-archive-tizen-tests/inst.wgt.py
@@ -10,7 +10,7 @@ import string
 import logging
 import Queue
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 from shellmanager import ShellManager
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -18,7 +18,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+tct_parser = configparser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 USER_DIR = tct_parser.get('DEVICE', 'DEVICE_USER_30')
@@ -53,10 +53,10 @@ def getInternalStorage():
         shell_mgr.write_cmd('export `tzplatform-get --user ' +PARAMETERS.user+' TZ_USER_CONTENT`', '', None)
         INTERNAL_STORAGE=shell_mgr.write_cmd('echo $TZ_USER_CONTENT','', None)
         INTERNAL_STORAGE=str(INTERNAL_STORAGE[len(INTERNAL_STORAGE)-1])
-        print str(INTERNAL_STORAGE)
+        print (str(INTERNAL_STORAGE))
         
     except Exception as ex:
-        print ex
+        print (ex)
     finally:
         shell_mgr.close_shellpipe()
 
@@ -72,7 +72,7 @@ def getInternalStorage():
 #                PARAMETERS.device)
 #        return doCMD(cmd)
 #    except Exception as ex:
-#        print ex
+#        print (ex)
 #    else:
 #        print ("aaaaaaaaaaaaaaa")
 #    os.system(
@@ -85,14 +85,14 @@ def getInternalStorage():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -245,8 +245,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -265,7 +265,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -279,10 +279,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-archive-tizen-tests/inst.xpk.py b/common/tct-archive-tizen-tests/inst.xpk.py
index 371cc3088b64a6bf329cda62ffbeea6f445c9932..9a9a8f4e39b8c71aac5872e950809d105dabc930 100755 (executable)
--- a/common/tct-archive-tizen-tests/inst.xpk.py
+++ b/common/tct-archive-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -181,8 +181,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -201,7 +201,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -211,10 +211,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-archive-tizen-tests/pack.py b/common/tct-archive-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-archive-tizen-tests/pack.py
+++ b/common/tct-archive-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-audio-html5-tests/inst.apk.py b/common/tct-audio-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-audio-html5-tests/inst.apk.py
+++ b/common/tct-audio-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-audio-html5-tests/inst.wgt.py b/common/tct-audio-html5-tests/inst.wgt.py
index a7478a0613c9939079c22eb209166b7ec72a5b53..6ae9cae4a2dd6e08388d943e816c9ac51b721bc0 100755 (executable)
--- a/common/tct-audio-html5-tests/inst.wgt.py
+++ b/common/tct-audio-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-audio-html5-tests/inst.xpk.py b/common/tct-audio-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-audio-html5-tests/inst.xpk.py
+++ b/common/tct-audio-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-audio-html5-tests/pack.py b/common/tct-audio-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-audio-html5-tests/pack.py
+++ b/common/tct-audio-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-backgrounds-css3-tests/inst.apk.py b/common/tct-backgrounds-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-backgrounds-css3-tests/inst.apk.py
+++ b/common/tct-backgrounds-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-backgrounds-css3-tests/inst.wgt.py b/common/tct-backgrounds-css3-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-backgrounds-css3-tests/inst.wgt.py
+++ b/common/tct-backgrounds-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-backgrounds-css3-tests/inst.xpk.py b/common/tct-backgrounds-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-backgrounds-css3-tests/inst.xpk.py
+++ b/common/tct-backgrounds-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-backgrounds-css3-tests/pack.py b/common/tct-backgrounds-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-backgrounds-css3-tests/pack.py
+++ b/common/tct-backgrounds-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-badge-tizen-tests/inst.apk.py b/common/tct-badge-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-badge-tizen-tests/inst.apk.py
+++ b/common/tct-badge-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-badge-tizen-tests/inst.wgt.py b/common/tct-badge-tizen-tests/inst.wgt.py
index 18690763e66ef8bdab827e9de7d7691a83ab6d80..5bbb418f3c213a2dd1219536f7990ce4801dbeba 100755 (executable)
--- a/common/tct-badge-tizen-tests/inst.wgt.py
+++ b/common/tct-badge-tizen-tests/inst.wgt.py
@@ -1,242 +1,242 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-badge-tizen-tests/inst.xpk.py b/common/tct-badge-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-badge-tizen-tests/inst.xpk.py
+++ b/common/tct-badge-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-badge-tizen-tests/pack.py b/common/tct-badge-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-badge-tizen-tests/pack.py
+++ b/common/tct-badge-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-batterystatus-w3c-tests/inst.apk.py b/common/tct-batterystatus-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-batterystatus-w3c-tests/inst.apk.py
+++ b/common/tct-batterystatus-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-batterystatus-w3c-tests/inst.wgt.py b/common/tct-batterystatus-w3c-tests/inst.wgt.py
index 7e3caa6c37e5ece07ffd4a4d06e7dce5ed8dc929..b88c1fccf124a302d1e7f6c29dc86f24109e53b9 100755 (executable)
--- a/common/tct-batterystatus-w3c-tests/inst.wgt.py
+++ b/common/tct-batterystatus-w3c-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-batterystatus-w3c-tests/inst.xpk.py b/common/tct-batterystatus-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-batterystatus-w3c-tests/inst.xpk.py
+++ b/common/tct-batterystatus-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-batterystatus-w3c-tests/pack.py b/common/tct-batterystatus-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-batterystatus-w3c-tests/pack.py
+++ b/common/tct-batterystatus-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-beacon-w3c-tests/inst.apk.py b/common/tct-beacon-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-beacon-w3c-tests/inst.apk.py
+++ b/common/tct-beacon-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-beacon-w3c-tests/inst.wgt.py b/common/tct-beacon-w3c-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-beacon-w3c-tests/inst.wgt.py
+++ b/common/tct-beacon-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-beacon-w3c-tests/inst.xpk.py b/common/tct-beacon-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-beacon-w3c-tests/inst.xpk.py
+++ b/common/tct-beacon-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-beacon-w3c-tests/pack.py b/common/tct-beacon-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-beacon-w3c-tests/pack.py
+++ b/common/tct-beacon-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-bluetooth-tizen-tests/inst.apk.py b/common/tct-bluetooth-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-bluetooth-tizen-tests/inst.apk.py
+++ b/common/tct-bluetooth-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-bluetooth-tizen-tests/inst.wgt.py b/common/tct-bluetooth-tizen-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-bluetooth-tizen-tests/inst.wgt.py
+++ b/common/tct-bluetooth-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-bluetooth-tizen-tests/inst.xpk.py b/common/tct-bluetooth-tizen-tests/inst.xpk.py
index c0c358eccbe00400cf69651e2937542462b771d2..34a9d92c36c7de32dda454d634bc849fdea0cc0d 100755 (executable)
--- a/common/tct-bluetooth-tizen-tests/inst.xpk.py
+++ b/common/tct-bluetooth-tizen-tests/inst.xpk.py
@@ -1,214 +1,214 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-bluetooth-tizen-tests/pack.py b/common/tct-bluetooth-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-bluetooth-tizen-tests/pack.py
+++ b/common/tct-bluetooth-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-browserstate-html5-tests/inst.apk.py b/common/tct-browserstate-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-browserstate-html5-tests/inst.apk.py
+++ b/common/tct-browserstate-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-browserstate-html5-tests/inst.wgt.py b/common/tct-browserstate-html5-tests/inst.wgt.py
index 7e3caa6c37e5ece07ffd4a4d06e7dce5ed8dc929..b88c1fccf124a302d1e7f6c29dc86f24109e53b9 100755 (executable)
--- a/common/tct-browserstate-html5-tests/inst.wgt.py
+++ b/common/tct-browserstate-html5-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-browserstate-html5-tests/inst.xpk.py b/common/tct-browserstate-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-browserstate-html5-tests/inst.xpk.py
+++ b/common/tct-browserstate-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-browserstate-html5-tests/pack.py b/common/tct-browserstate-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-browserstate-html5-tests/pack.py
+++ b/common/tct-browserstate-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-calendar-tizen-tests/inst.apk.py b/common/tct-calendar-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-calendar-tizen-tests/inst.apk.py
+++ b/common/tct-calendar-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-calendar-tizen-tests/inst.wgt.py b/common/tct-calendar-tizen-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/common/tct-calendar-tizen-tests/inst.wgt.py
+++ b/common/tct-calendar-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-calendar-tizen-tests/inst.xpk.py b/common/tct-calendar-tizen-tests/inst.xpk.py
index 36b426acba322a44e19eb93fe221ea55337dd8f7..10bb5c425bea785ba7077e5f53efe6a3a9e317b6 100755 (executable)
--- a/common/tct-calendar-tizen-tests/inst.xpk.py
+++ b/common/tct-calendar-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = ""
-PKG_SRC_DIR = ""
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-
-    global SRC_DIR, PKG_SRC_DIR
-    SRC_DIR = "/home/%s/content" % PARAMETERS.user
-    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = ""\r
+PKG_SRC_DIR = ""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+\r
+    global SRC_DIR, PKG_SRC_DIR\r
+    SRC_DIR = "/home/%s/content" % PARAMETERS.user\r
+    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-calendar-tizen-tests/pack.py b/common/tct-calendar-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-calendar-tizen-tests/pack.py
+++ b/common/tct-calendar-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-callhistory-tizen-tests/inst.apk.py b/common/tct-callhistory-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-callhistory-tizen-tests/inst.apk.py
+++ b/common/tct-callhistory-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-callhistory-tizen-tests/inst.wgt.py b/common/tct-callhistory-tizen-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/common/tct-callhistory-tizen-tests/inst.wgt.py
+++ b/common/tct-callhistory-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-callhistory-tizen-tests/inst.xpk.py b/common/tct-callhistory-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-callhistory-tizen-tests/inst.xpk.py
+++ b/common/tct-callhistory-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-callhistory-tizen-tests/pack.py b/common/tct-callhistory-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-callhistory-tizen-tests/pack.py
+++ b/common/tct-callhistory-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-canvas-html5-tests/inst.apk.py b/common/tct-canvas-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-canvas-html5-tests/inst.apk.py
+++ b/common/tct-canvas-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-canvas-html5-tests/inst.wgt.py b/common/tct-canvas-html5-tests/inst.wgt.py
index 84a331b62dc6dbffaa9542a138e4b8281dfb87a2..275a9362dc8d517d92f500a41640b1d07eb14b45 100755 (executable)
--- a/common/tct-canvas-html5-tests/inst.wgt.py
+++ b/common/tct-canvas-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-canvas-html5-tests/inst.xpk.py b/common/tct-canvas-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-canvas-html5-tests/inst.xpk.py
+++ b/common/tct-canvas-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-canvas-html5-tests/pack.py b/common/tct-canvas-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-canvas-html5-tests/pack.py
+++ b/common/tct-canvas-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-colors-css3-tests/inst.apk.py b/common/tct-colors-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-colors-css3-tests/inst.apk.py
+++ b/common/tct-colors-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-colors-css3-tests/inst.wgt.py b/common/tct-colors-css3-tests/inst.wgt.py
index c7f89fd44607b570bbcae5447b935557cf8e590b..909755af3b4e03918ae3823bc036ddf994a43999 100755 (executable)
--- a/common/tct-colors-css3-tests/inst.wgt.py
+++ b/common/tct-colors-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-colors-css3-tests/inst.xpk.py b/common/tct-colors-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-colors-css3-tests/inst.xpk.py
+++ b/common/tct-colors-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-colors-css3-tests/pack.py b/common/tct-colors-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-colors-css3-tests/pack.py
+++ b/common/tct-colors-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-contact-tizen-tests/inst.apk.py b/common/tct-contact-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-contact-tizen-tests/inst.apk.py
+++ b/common/tct-contact-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-contact-tizen-tests/inst.wgt.py b/common/tct-contact-tizen-tests/inst.wgt.py
index f04d84498da7020290008080fed75b8de38b1250..80b6b1ba82c774b1babdd56ffb78e1b05d125b28 100755 (executable)
--- a/common/tct-contact-tizen-tests/inst.wgt.py
+++ b/common/tct-contact-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -36,7 +36,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -48,14 +48,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -199,8 +199,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -219,7 +219,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -231,10 +231,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-contact-tizen-tests/inst.xpk.py b/common/tct-contact-tizen-tests/inst.xpk.py
index 371cc3088b64a6bf329cda62ffbeea6f445c9932..9fc4020ebaca658befc18d5afde68b7b16b58c3e 100755 (executable)
--- a/common/tct-contact-tizen-tests/inst.xpk.py
+++ b/common/tct-contact-tizen-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s/Others" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/Others" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s/Others" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/Others" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-contact-tizen-tests/pack.py b/common/tct-contact-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-contact-tizen-tests/pack.py
+++ b/common/tct-contact-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-content-tizen-tests/Queue.pyc b/common/tct-content-tizen-tests/Queue.pyc
old mode 100755 (executable)
new mode 100644 (file)
index 0ad5930..9fad00e
Binary files a/common/tct-content-tizen-tests/Queue.pyc and b/common/tct-content-tizen-tests/Queue.pyc differ

diff --git a/common/tct-content-tizen-tests/inst.apk.py b/common/tct-content-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-content-tizen-tests/inst.apk.py
+++ b/common/tct-content-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-content-tizen-tests/inst.wgt.py b/common/tct-content-tizen-tests/inst.wgt.py
index 08c6d3d3437383a63c269297e5c6b51e869b63b5..1508860d8fbe25050e68dd96af8e8689327d3134 100755 (executable)
--- a/common/tct-content-tizen-tests/inst.wgt.py
+++ b/common/tct-content-tizen-tests/inst.wgt.py
@@ -10,7 +10,7 @@ import string
 import logging
 import Queue
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 from shellmanager import ShellManager
 
 time.sleep(3)
@@ -20,7 +20,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+tct_parser = configparser.ConfigParser()
 tct_parser.read(TCT_CONFIG_FILE)
 SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')
 #INTERNAL_STORAGE = tct_parser.get('DEVICE', 'DEVICE_STORAGE_30')
@@ -72,51 +72,28 @@ def getInternalStorage():
         shell_mgr.write_cmd('export `tzplatform-get --user ' +PARAMETERS.user+' TZ_USER_CONTENT`', '', None)
         INTERNAL_STORAGE=shell_mgr.write_cmd('echo $TZ_USER_CONTENT','', None)
         INTERNAL_STORAGE=str(INTERNAL_STORAGE[len(INTERNAL_STORAGE)-1])
-        print str(INTERNAL_STORAGE)
+        print (str(INTERNAL_STORAGE))
         
     except Exception as ex:
-        print ex
+        print (ex)
     finally:
         shell_mgr.close_shellpipe()
 
 def askpolicyremoving():
-    print "0"
-    print "0"
-    print "0"
-    print "0"
-    print "0"
     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 pkg_id
-    print pkg_id
-    print pkg_id
+    print (pkg_id)
     print (os.getcwd())
-    print (os.getcwd())
-    print (os.path.dirname(os.path.realpath(__file__)) )
     print (os.path.dirname(os.path.realpath(__file__)) )
     if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):
         action_status = False
-    print "1"
-    print "1"
-    print "1"
-    print "1"
-    print "1"
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, 
         SRC_DIR, pkg_id)
-        print cmd
-        print cmd
-        print cmd
-        print cmd
-        print cmd
-    return doCMD(cmd)        
-    print "2"
-    print "2"
-    print "2"
+    return doCMD(cmd)
         
 def recordInternalStorage():
     try:
@@ -130,7 +107,7 @@ def recordInternalStorage():
                 PARAMETERS.device)
         return doCMD(cmd)
     except Exception as ex:
-        print ex
+        print (ex)
     else:
         print ("aaaaaaaaaaaaaaa")
 #    os.system(
@@ -143,14 +120,14 @@ def recordInternalStorage():
     
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -273,8 +250,6 @@ def instPKGs():
                         action_status = False
                         break
     print(INTERNAL_STORAGE)
-    print(INTERNAL_STORAGE)
-    print(INTERNAL_STORAGE)
     if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):
         action_status = False
     if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/Downloads/" % (INTERNAL_STORAGE)):
@@ -303,8 +278,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -323,7 +298,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -337,10 +312,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:
@@ -348,11 +323,6 @@ def main():
             sys.exit(1)
     else:
         if not instPKGs():
-            print "inst"
-            print "inst"
-            print "inst"
-            print "inst"
-            print "inst"
             #askpolicyremoving()
             sys.exit(1)
 

diff --git a/common/tct-content-tizen-tests/inst.xpk.py b/common/tct-content-tizen-tests/inst.xpk.py
index c3b031d9a3fdd166a84d260199e9b57d7eae0f21..3626cd23a52e42bf8c16533d5f908c282294d733 100755 (executable)
--- a/common/tct-content-tizen-tests/inst.xpk.py
+++ b/common/tct-content-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -173,8 +173,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -193,7 +193,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -203,10 +203,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-content-tizen-tests/pack.py b/common/tct-content-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-content-tizen-tests/pack.py
+++ b/common/tct-content-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-content-tizen-tests/shellmanager.pyc b/common/tct-content-tizen-tests/shellmanager.pyc
old mode 100755 (executable)
new mode 100644 (file)
index 12c9ac6..4d0e366
Binary files a/common/tct-content-tizen-tests/shellmanager.pyc and b/common/tct-content-tizen-tests/shellmanager.pyc differ

diff --git a/common/tct-convergence-tizen-tests/inst.apk.py b/common/tct-convergence-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-convergence-tizen-tests/inst.apk.py
+++ b/common/tct-convergence-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-convergence-tizen-tests/inst.wgt.py b/common/tct-convergence-tizen-tests/inst.wgt.py
index 0c4e2056a3aa7b494e929ca7f813051c1276e906..8f0296ef1e6a8d941ebdd67d0f909229c3b01c7c 100755 (executable)
--- a/common/tct-convergence-tizen-tests/inst.wgt.py
+++ b/common/tct-convergence-tizen-tests/inst.wgt.py
@@ -1,223 +1,223 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-
-    for pkg_name in ["tct-alarm-tizen-tests", "alarmTestApp"]:
-        pkg_id = getPKGID(pkg_name)
-        if not pkg_id:
-            action_status = False
-            continue
-        (return_code, output) = doRemoteCMD("pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-        for line in output:
-            if "Failure" in line:
-                action_status = False
-                break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+\r
+    for pkg_name in ["tct-alarm-tizen-tests", "alarmTestApp"]:\r
+        pkg_id = getPKGID(pkg_name)\r
+        if not pkg_id:\r
+            action_status = False\r
+            continue\r
+        (return_code, output) = doRemoteCMD("pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+        for line in output:\r
+            if "Failure" in line:\r
+                action_status = False\r
+                break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT,SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-convergence-tizen-tests/inst.xpk.py b/common/tct-convergence-tizen-tests/inst.xpk.py
index c0c358eccbe00400cf69651e2937542462b771d2..34a9d92c36c7de32dda454d634bc849fdea0cc0d 100755 (executable)
--- a/common/tct-convergence-tizen-tests/inst.xpk.py
+++ b/common/tct-convergence-tizen-tests/inst.xpk.py
@@ -1,214 +1,214 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-convergence-tizen-tests/pack.py b/common/tct-convergence-tizen-tests/pack.py
index 08d55aafea37b74455bc394308459ede3844bb7c..92866ab2ed6acacf72d8704056c4c25f4835332a 100755 (executable)
--- a/common/tct-convergence-tizen-tests/pack.py
+++ b/common/tct-convergence-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-cors-w3c-tests/inst.apk.py b/common/tct-cors-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-cors-w3c-tests/inst.apk.py
+++ b/common/tct-cors-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-cors-w3c-tests/inst.wgt.py b/common/tct-cors-w3c-tests/inst.wgt.py
index 30dfea1b203fb8045811eb301861c74840cab84b..f543d1d01f9815574652a19dda1a0dcc92e46a58 100755 (executable)
--- a/common/tct-cors-w3c-tests/inst.wgt.py
+++ b/common/tct-cors-w3c-tests/inst.wgt.py
@@ -1,239 +1,239 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-    for item in glob.glob("%s/cors/support/cgi/*" % SCRIPT_DIR):
-        item_name = os.path.basename(item)
-        if not doRemoteCopy(item, "%s/cors/support/%s" % (PKG_SRC_DIR, item_name)):
-        #if not doRemoteCopy(item, PKG_SRC_DIR):
-            action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+    for item in glob.glob("%s/cors/support/cgi/*" % SCRIPT_DIR):\r
+        item_name = os.path.basename(item)\r
+        if not doRemoteCopy(item, "%s/cors/support/%s" % (PKG_SRC_DIR, item_name)):\r
+        #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+            action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-cors-w3c-tests/inst.xpk.py b/common/tct-cors-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-cors-w3c-tests/inst.xpk.py
+++ b/common/tct-cors-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-cors-w3c-tests/pack.py b/common/tct-cors-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-cors-w3c-tests/pack.py
+++ b/common/tct-cors-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-crypto-w3c-tests/inst.apk.py b/common/tct-crypto-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-crypto-w3c-tests/inst.apk.py
+++ b/common/tct-crypto-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-crypto-w3c-tests/inst.wgt.py b/common/tct-crypto-w3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-crypto-w3c-tests/inst.wgt.py
+++ b/common/tct-crypto-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-crypto-w3c-tests/inst.xpk.py b/common/tct-crypto-w3c-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-crypto-w3c-tests/inst.xpk.py
+++ b/common/tct-crypto-w3c-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-crypto-w3c-tests/pack.py b/common/tct-crypto-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-crypto-w3c-tests/pack.py
+++ b/common/tct-crypto-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-csp-w3c-tests/inst.apk.py b/common/tct-csp-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-csp-w3c-tests/inst.apk.py
+++ b/common/tct-csp-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-csp-w3c-tests/inst.wgt.py b/common/tct-csp-w3c-tests/inst.wgt.py
index 076b4489e7c9bad7c44d0241000feb9268660eee..be3dfd026d8e0d57838409cd5a61d8a0c037db1f 100755 (executable)
--- a/common/tct-csp-w3c-tests/inst.wgt.py
+++ b/common/tct-csp-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -184,8 +184,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -204,7 +204,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -216,10 +216,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-csp-w3c-tests/inst.xpk.py b/common/tct-csp-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-csp-w3c-tests/inst.xpk.py
+++ b/common/tct-csp-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-csp-w3c-tests/pack.py b/common/tct-csp-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-csp-w3c-tests/pack.py
+++ b/common/tct-csp-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-customelement-w3c-tests/inst.apk.py b/common/tct-customelement-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-customelement-w3c-tests/inst.apk.py
+++ b/common/tct-customelement-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-customelement-w3c-tests/inst.wgt.py b/common/tct-customelement-w3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-customelement-w3c-tests/inst.wgt.py
+++ b/common/tct-customelement-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-customelement-w3c-tests/inst.xpk.py b/common/tct-customelement-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-customelement-w3c-tests/inst.xpk.py
+++ b/common/tct-customelement-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-customelement-w3c-tests/pack.py b/common/tct-customelement-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-customelement-w3c-tests/pack.py
+++ b/common/tct-customelement-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-datacontrol-tizen-tests/inst.apk.py b/common/tct-datacontrol-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-datacontrol-tizen-tests/inst.apk.py
+++ b/common/tct-datacontrol-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-datacontrol-tizen-tests/inst.wgt.py b/common/tct-datacontrol-tizen-tests/inst.wgt.py
index 9198206757f8fcfd46b33f9bbce3686eb05238cb..c6205c048243c41146c49f200407baf4198df226 100755 (executable)
--- a/common/tct-datacontrol-tizen-tests/inst.wgt.py
+++ b/common/tct-datacontrol-tizen-tests/inst.wgt.py
@@ -1,222 +1,222 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-datacontrol-tizen-tests/inst.xpk.py b/common/tct-datacontrol-tizen-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-datacontrol-tizen-tests/inst.xpk.py
+++ b/common/tct-datacontrol-tizen-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-datacontrol-tizen-tests/pack.py b/common/tct-datacontrol-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-datacontrol-tizen-tests/pack.py
+++ b/common/tct-datacontrol-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-device-cordova-tests/inst.apk.py b/common/tct-device-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-device-cordova-tests/inst.apk.py
+++ b/common/tct-device-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-device-cordova-tests/inst.wgt.py b/common/tct-device-cordova-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-device-cordova-tests/inst.wgt.py
+++ b/common/tct-device-cordova-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-device-cordova-tests/inst.xpk.py b/common/tct-device-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-device-cordova-tests/inst.xpk.py
+++ b/common/tct-device-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-device-cordova-tests/pack.py b/common/tct-device-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-device-cordova-tests/pack.py
+++ b/common/tct-device-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-devicemotion-cordova-tests/inst.apk.py b/common/tct-devicemotion-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-devicemotion-cordova-tests/inst.apk.py
+++ b/common/tct-devicemotion-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-devicemotion-cordova-tests/inst.wgt.py b/common/tct-devicemotion-cordova-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-devicemotion-cordova-tests/inst.wgt.py
+++ b/common/tct-devicemotion-cordova-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-devicemotion-cordova-tests/inst.xpk.py b/common/tct-devicemotion-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-devicemotion-cordova-tests/inst.xpk.py
+++ b/common/tct-devicemotion-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-devicemotion-cordova-tests/pack.py b/common/tct-devicemotion-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-devicemotion-cordova-tests/pack.py
+++ b/common/tct-devicemotion-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-deviceorientation-w3c-tests/inst.apk.py b/common/tct-deviceorientation-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-deviceorientation-w3c-tests/inst.apk.py
+++ b/common/tct-deviceorientation-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-deviceorientation-w3c-tests/inst.wgt.py b/common/tct-deviceorientation-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-deviceorientation-w3c-tests/inst.wgt.py
+++ b/common/tct-deviceorientation-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-deviceorientation-w3c-tests/inst.xpk.py b/common/tct-deviceorientation-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-deviceorientation-w3c-tests/inst.xpk.py
+++ b/common/tct-deviceorientation-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-deviceorientation-w3c-tests/pack.py b/common/tct-deviceorientation-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-deviceorientation-w3c-tests/pack.py
+++ b/common/tct-deviceorientation-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-dialogs-cordova-tests/inst.apk.py b/common/tct-dialogs-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-dialogs-cordova-tests/inst.apk.py
+++ b/common/tct-dialogs-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-dialogs-cordova-tests/inst.wgt.py b/common/tct-dialogs-cordova-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-dialogs-cordova-tests/inst.wgt.py
+++ b/common/tct-dialogs-cordova-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-dialogs-cordova-tests/inst.xpk.py b/common/tct-dialogs-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-dialogs-cordova-tests/inst.xpk.py
+++ b/common/tct-dialogs-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-dialogs-cordova-tests/pack.py b/common/tct-dialogs-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-dialogs-cordova-tests/pack.py
+++ b/common/tct-dialogs-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-dnd-html5-tests/inst.apk.py b/common/tct-dnd-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-dnd-html5-tests/inst.apk.py
+++ b/common/tct-dnd-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-dnd-html5-tests/inst.wgt.py b/common/tct-dnd-html5-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-dnd-html5-tests/inst.wgt.py
+++ b/common/tct-dnd-html5-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-dnd-html5-tests/inst.xpk.py b/common/tct-dnd-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-dnd-html5-tests/inst.xpk.py
+++ b/common/tct-dnd-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-dnd-html5-tests/pack.py b/common/tct-dnd-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-dnd-html5-tests/pack.py
+++ b/common/tct-dnd-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-download-tizen-tests/Queue.pyc b/common/tct-download-tizen-tests/Queue.pyc
old mode 100755 (executable)
new mode 100644 (file)
index 987860d..f79be96
Binary files a/common/tct-download-tizen-tests/Queue.pyc and b/common/tct-download-tizen-tests/Queue.pyc differ

diff --git a/common/tct-download-tizen-tests/inst.apk.py b/common/tct-download-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-download-tizen-tests/inst.apk.py
+++ b/common/tct-download-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-download-tizen-tests/inst.wgt.py b/common/tct-download-tizen-tests/inst.wgt.py
index dccbfe5ebff1d5664bc1cfa5ee52c1d94f3c4e9e..d2daaf7c41bfb720fe5bf08b1895e8525c02dec7 100755 (executable)
--- a/common/tct-download-tizen-tests/inst.wgt.py
+++ b/common/tct-download-tizen-tests/inst.wgt.py
@@ -10,7 +10,7 @@ import string
 import logging
 import Queue
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 from shellmanager import ShellManager
 
 time.sleep(3)
@@ -20,7 +20,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -43,23 +43,23 @@ def getInternalStorage():
         shell_mgr.write_cmd('export `tzplatform-get --user ' +PARAMETERS.user+' TZ_USER_CONTENT`', '', None)
         INTERNAL_STORAGE=shell_mgr.write_cmd('echo $TZ_USER_CONTENT','', None)
         INTERNAL_STORAGE=str(INTERNAL_STORAGE[len(INTERNAL_STORAGE)-1])
-        print str(INTERNAL_STORAGE)
+        print (str(INTERNAL_STORAGE))
     except Exception as ex:
-        print ex
+        print (ex)
     finally:
         shell_mgr.close_shellpipe()
 
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -216,8 +216,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -236,26 +236,23 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
 
-    print "1"
     getInternalStorage()
-    print "2"
-    user_info = getUSERID()
-    print "3"    
+    user_info = getUSERID() 
     re_code = user_info[0]
     if re_code == 0 :
         global XW_ENV
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-download-tizen-tests/inst.xpk.py b/common/tct-download-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-download-tizen-tests/inst.xpk.py
+++ b/common/tct-download-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-download-tizen-tests/pack.py b/common/tct-download-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-download-tizen-tests/pack.py
+++ b/common/tct-download-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-download-tizen-tests/shellmanager.pyc b/common/tct-download-tizen-tests/shellmanager.pyc
old mode 100755 (executable)
new mode 100644 (file)
index 7fd5296..68af55f
Binary files a/common/tct-download-tizen-tests/shellmanager.pyc and b/common/tct-download-tizen-tests/shellmanager.pyc differ

diff --git a/common/tct-events-cordova-tests/inst.apk.py b/common/tct-events-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-events-cordova-tests/inst.apk.py
+++ b/common/tct-events-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-events-cordova-tests/inst.wgt.py b/common/tct-events-cordova-tests/inst.wgt.py
index 28b1eb42a8050b6e383212dd04fd0aec51784495..7db68dc05325eca7dfd64e4f5362039b0278cca6 100755 (executable)
--- a/common/tct-events-cordova-tests/inst.wgt.py
+++ b/common/tct-events-cordova-tests/inst.wgt.py
@@ -1,224 +1,224 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith("%s.wgt" % PKG_NAME):
-                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))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith("%s.wgt" % PKG_NAME):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-events-cordova-tests/inst.xpk.py b/common/tct-events-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-events-cordova-tests/inst.xpk.py
+++ b/common/tct-events-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-events-cordova-tests/pack.py b/common/tct-events-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-events-cordova-tests/pack.py
+++ b/common/tct-events-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-exif-tizen-tests/inst.apk.py b/common/tct-exif-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-exif-tizen-tests/inst.apk.py
+++ b/common/tct-exif-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-exif-tizen-tests/inst.wgt.py b/common/tct-exif-tizen-tests/inst.wgt.py
index d458986499bc2a7f197a809113f71723667c766f..770b313072d64eb0063cbb9dda06945d1ead940c 100755 (executable)
--- a/common/tct-exif-tizen-tests/inst.wgt.py
+++ b/common/tct-exif-tizen-tests/inst.wgt.py
@@ -1,232 +1,232 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-exif-tizen-tests/inst.xpk.py b/common/tct-exif-tizen-tests/inst.xpk.py
index c3b031d9a3fdd166a84d260199e9b57d7eae0f21..1d0aba4a0256cb3596e9df1c8535643fc820ce63 100755 (executable)
--- a/common/tct-exif-tizen-tests/inst.xpk.py
+++ b/common/tct-exif-tizen-tests/inst.xpk.py
@@ -1,221 +1,221 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    if not doRemoteCopy("%s/media" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-exif-tizen-tests/pack.py b/common/tct-exif-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-exif-tizen-tests/pack.py
+++ b/common/tct-exif-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-extra-html5-tests/inst.apk.py b/common/tct-extra-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-extra-html5-tests/inst.apk.py
+++ b/common/tct-extra-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-extra-html5-tests/inst.wgt.py b/common/tct-extra-html5-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-extra-html5-tests/inst.wgt.py
+++ b/common/tct-extra-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-extra-html5-tests/inst.xpk.py b/common/tct-extra-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-extra-html5-tests/inst.xpk.py
+++ b/common/tct-extra-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-extra-html5-tests/pack.py b/common/tct-extra-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-extra-html5-tests/pack.py
+++ b/common/tct-extra-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-feedback-tizen-tests/inst.apk.py b/common/tct-feedback-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-feedback-tizen-tests/inst.apk.py
+++ b/common/tct-feedback-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-feedback-tizen-tests/inst.wgt.py b/common/tct-feedback-tizen-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-feedback-tizen-tests/inst.wgt.py
+++ b/common/tct-feedback-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-feedback-tizen-tests/inst.xpk.py b/common/tct-feedback-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-feedback-tizen-tests/inst.xpk.py
+++ b/common/tct-feedback-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-feedback-tizen-tests/pack.py b/common/tct-feedback-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-feedback-tizen-tests/pack.py
+++ b/common/tct-feedback-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-file-cordova-tests/inst.apk.py b/common/tct-file-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-file-cordova-tests/inst.apk.py
+++ b/common/tct-file-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-file-cordova-tests/inst.wgt.py b/common/tct-file-cordova-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-file-cordova-tests/inst.wgt.py
+++ b/common/tct-file-cordova-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-file-cordova-tests/inst.xpk.py b/common/tct-file-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-file-cordova-tests/inst.xpk.py
+++ b/common/tct-file-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-file-cordova-tests/pack.py b/common/tct-file-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-file-cordova-tests/pack.py
+++ b/common/tct-file-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-file-transfer-cordova-tests/inst.apk.py b/common/tct-file-transfer-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/inst.apk.py
+++ b/common/tct-file-transfer-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-file-transfer-cordova-tests/inst.wgt.py b/common/tct-file-transfer-cordova-tests/inst.wgt.py
index 4bcbd777fe52ac33fb287667607bbeb4600c32c2..659267fd695160d797f0e2480af7c248368942ad 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/inst.wgt.py
+++ b/common/tct-file-transfer-cordova-tests/inst.wgt.py
@@ -1,259 +1,259 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith("%s.wgt" % PKG_NAME):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-                action_status = False
-
-    if not doRemoteCopy("%s/file-transfer" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):
-        action_status = False
-               
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith("%s.wgt" % PKG_NAME):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+                action_status = False\r
+\r
+    if not doRemoteCopy("%s/file-transfer" % SCRIPT_DIR, "%s/%s" % (SRC_DIR, PKG_NAME)):\r
+        action_status = False\r
+               \r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-file-transfer-cordova-tests/inst.xpk.py b/common/tct-file-transfer-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/inst.xpk.py
+++ b/common/tct-file-transfer-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-file-transfer-cordova-tests/pack.py b/common/tct-file-transfer-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-file-transfer-cordova-tests/pack.py
+++ b/common/tct-file-transfer-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-fileapi-w3c-tests/inst.apk.py b/common/tct-fileapi-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-fileapi-w3c-tests/inst.apk.py
+++ b/common/tct-fileapi-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fileapi-w3c-tests/inst.wgt.py b/common/tct-fileapi-w3c-tests/inst.wgt.py
index 84a331b62dc6dbffaa9542a138e4b8281dfb87a2..275a9362dc8d517d92f500a41640b1d07eb14b45 100755 (executable)
--- a/common/tct-fileapi-w3c-tests/inst.wgt.py
+++ b/common/tct-fileapi-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-fileapi-w3c-tests/inst.xpk.py b/common/tct-fileapi-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-fileapi-w3c-tests/inst.xpk.py
+++ b/common/tct-fileapi-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fileapi-w3c-tests/pack.py b/common/tct-fileapi-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-fileapi-w3c-tests/pack.py
+++ b/common/tct-fileapi-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-filesystem-tizen-tests/inst.apk.py b/common/tct-filesystem-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-filesystem-tizen-tests/inst.apk.py
+++ b/common/tct-filesystem-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-filesystem-tizen-tests/inst.wgt.py b/common/tct-filesystem-tizen-tests/inst.wgt.py
index 44e57cf176811a997dd4abf590ad6d6c821d1835..5322534da626685908b341990530d3d06976154b 100755 (executable)
--- a/common/tct-filesystem-tizen-tests/inst.wgt.py
+++ b/common/tct-filesystem-tizen-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-filesystem-tizen-tests/inst.xpk.py b/common/tct-filesystem-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-filesystem-tizen-tests/inst.xpk.py
+++ b/common/tct-filesystem-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-filesystem-tizen-tests/pack.py b/common/tct-filesystem-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-filesystem-tizen-tests/pack.py
+++ b/common/tct-filesystem-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-flexiblebox-css3-tests/inst.apk.py b/common/tct-flexiblebox-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-flexiblebox-css3-tests/inst.apk.py
+++ b/common/tct-flexiblebox-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-flexiblebox-css3-tests/inst.wgt.py b/common/tct-flexiblebox-css3-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-flexiblebox-css3-tests/inst.wgt.py
+++ b/common/tct-flexiblebox-css3-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-flexiblebox-css3-tests/inst.xpk.py b/common/tct-flexiblebox-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-flexiblebox-css3-tests/inst.xpk.py
+++ b/common/tct-flexiblebox-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-flexiblebox-css3-tests/pack.py b/common/tct-flexiblebox-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-flexiblebox-css3-tests/pack.py
+++ b/common/tct-flexiblebox-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-fmradio-tizen-tests/inst.apk.py b/common/tct-fmradio-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-fmradio-tizen-tests/inst.apk.py
+++ b/common/tct-fmradio-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fmradio-tizen-tests/inst.wgt.py b/common/tct-fmradio-tizen-tests/inst.wgt.py
index dc5e8b8b3b44d332f5bafdfa76849620596a137e..8b5d2f8a89d17eb806b0eb5b8dc8e7101b103472 100755 (executable)
--- a/common/tct-fmradio-tizen-tests/inst.wgt.py
+++ b/common/tct-fmradio-tizen-tests/inst.wgt.py
@@ -1,239 +1,239 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fmradio-tizen-tests/inst.xpk.py b/common/tct-fmradio-tizen-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-fmradio-tizen-tests/inst.xpk.py
+++ b/common/tct-fmradio-tizen-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fmradio-tizen-tests/pack.py b/common/tct-fmradio-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-fmradio-tizen-tests/pack.py
+++ b/common/tct-fmradio-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-fonts-css3-tests/inst.apk.py b/common/tct-fonts-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-fonts-css3-tests/inst.apk.py
+++ b/common/tct-fonts-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fonts-css3-tests/inst.wgt.py b/common/tct-fonts-css3-tests/inst.wgt.py
index 122ddbf63fd9859b222d5a03900b770e97dc06be..795d087c4a049ae1d2035b240983faae6e12ac41 100755 (executable)
--- a/common/tct-fonts-css3-tests/inst.wgt.py
+++ b/common/tct-fonts-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -34,14 +34,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -210,8 +210,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -230,7 +230,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -242,10 +242,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-fonts-css3-tests/inst.xpk.py b/common/tct-fonts-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-fonts-css3-tests/inst.xpk.py
+++ b/common/tct-fonts-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fonts-css3-tests/pack.py b/common/tct-fonts-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-fonts-css3-tests/pack.py
+++ b/common/tct-fonts-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-forms-html5-tests/inst.apk.py b/common/tct-forms-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-forms-html5-tests/inst.apk.py
+++ b/common/tct-forms-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-forms-html5-tests/inst.wgt.py b/common/tct-forms-html5-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-forms-html5-tests/inst.wgt.py
+++ b/common/tct-forms-html5-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-forms-html5-tests/inst.xpk.py b/common/tct-forms-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-forms-html5-tests/inst.xpk.py
+++ b/common/tct-forms-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-forms-html5-tests/pack.py b/common/tct-forms-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-forms-html5-tests/pack.py
+++ b/common/tct-forms-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-fullscreen-nonw3c-tests/inst.apk.py b/common/tct-fullscreen-nonw3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-fullscreen-nonw3c-tests/inst.apk.py
+++ b/common/tct-fullscreen-nonw3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fullscreen-nonw3c-tests/inst.wgt.py b/common/tct-fullscreen-nonw3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-fullscreen-nonw3c-tests/inst.wgt.py
+++ b/common/tct-fullscreen-nonw3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-fullscreen-nonw3c-tests/inst.xpk.py b/common/tct-fullscreen-nonw3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-fullscreen-nonw3c-tests/inst.xpk.py
+++ b/common/tct-fullscreen-nonw3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-fullscreen-nonw3c-tests/pack.py b/common/tct-fullscreen-nonw3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-fullscreen-nonw3c-tests/pack.py
+++ b/common/tct-fullscreen-nonw3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-geoallow-w3c-tests/inst.apk.py b/common/tct-geoallow-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-geoallow-w3c-tests/inst.apk.py
+++ b/common/tct-geoallow-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-geoallow-w3c-tests/inst.wgt.py b/common/tct-geoallow-w3c-tests/inst.wgt.py
index d4fcbeb70aa7e9c2766b367bd41b364a2166fa11..e210b7d434e6f34a5e720877d2da493c1fdbe92a 100755 (executable)
--- a/common/tct-geoallow-w3c-tests/inst.wgt.py
+++ b/common/tct-geoallow-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-geoallow-w3c-tests/inst.xpk.py b/common/tct-geoallow-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-geoallow-w3c-tests/inst.xpk.py
+++ b/common/tct-geoallow-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-geoallow-w3c-tests/pack.py b/common/tct-geoallow-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-geoallow-w3c-tests/pack.py
+++ b/common/tct-geoallow-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-geodeny-w3c-tests/inst.apk.py b/common/tct-geodeny-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/inst.apk.py
+++ b/common/tct-geodeny-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-geodeny-w3c-tests/inst.wgt.py b/common/tct-geodeny-w3c-tests/inst.wgt.py
index d4fcbeb70aa7e9c2766b367bd41b364a2166fa11..e210b7d434e6f34a5e720877d2da493c1fdbe92a 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/inst.wgt.py
+++ b/common/tct-geodeny-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-geodeny-w3c-tests/inst.xpk.py b/common/tct-geodeny-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/inst.xpk.py
+++ b/common/tct-geodeny-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-geodeny-w3c-tests/pack.py b/common/tct-geodeny-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-geodeny-w3c-tests/pack.py
+++ b/common/tct-geodeny-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-globalization-cordova-tests/inst.apk.py b/common/tct-globalization-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-globalization-cordova-tests/inst.apk.py
+++ b/common/tct-globalization-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-globalization-cordova-tests/inst.wgt.py b/common/tct-globalization-cordova-tests/inst.wgt.py
index 1f51fd5adc5612985041675d5fb10803111c10d3..9604b1805263e4020cd07b21c2b5fb82f00d3227 100755 (executable)
--- a/common/tct-globalization-cordova-tests/inst.wgt.py
+++ b/common/tct-globalization-cordova-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -182,8 +182,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -202,7 +202,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -214,10 +214,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-globalization-cordova-tests/inst.xpk.py b/common/tct-globalization-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-globalization-cordova-tests/inst.xpk.py
+++ b/common/tct-globalization-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-globalization-cordova-tests/pack.py b/common/tct-globalization-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-globalization-cordova-tests/pack.py
+++ b/common/tct-globalization-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-gumallow-w3c-tests/inst.apk.py b/common/tct-gumallow-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-gumallow-w3c-tests/inst.apk.py
+++ b/common/tct-gumallow-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-gumallow-w3c-tests/inst.wgt.py b/common/tct-gumallow-w3c-tests/inst.wgt.py
index d4fcbeb70aa7e9c2766b367bd41b364a2166fa11..e210b7d434e6f34a5e720877d2da493c1fdbe92a 100755 (executable)
--- a/common/tct-gumallow-w3c-tests/inst.wgt.py
+++ b/common/tct-gumallow-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-gumallow-w3c-tests/inst.xpk.py b/common/tct-gumallow-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-gumallow-w3c-tests/inst.xpk.py
+++ b/common/tct-gumallow-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-gumallow-w3c-tests/pack.py b/common/tct-gumallow-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-gumallow-w3c-tests/pack.py
+++ b/common/tct-gumallow-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-humanactivitymonitor-tizen-tests/inst.apk.py b/common/tct-humanactivitymonitor-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-humanactivitymonitor-tizen-tests/inst.apk.py
+++ b/common/tct-humanactivitymonitor-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-humanactivitymonitor-tizen-tests/inst.wgt.py b/common/tct-humanactivitymonitor-tizen-tests/inst.wgt.py
index 851f32dae29f411e16c94359ce69be37f0ea13ea..fd32138f18f0659cebc8031e0517a19d94b82c9f 100755 (executable)
--- a/common/tct-humanactivitymonitor-tizen-tests/inst.wgt.py
+++ b/common/tct-humanactivitymonitor-tizen-tests/inst.wgt.py
@@ -1,259 +1,259 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-humanactivitymonitor-tizen-tests/inst.xpk.py b/common/tct-humanactivitymonitor-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-humanactivitymonitor-tizen-tests/inst.xpk.py
+++ b/common/tct-humanactivitymonitor-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-humanactivitymonitor-tizen-tests/pack.py b/common/tct-humanactivitymonitor-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-humanactivitymonitor-tizen-tests/pack.py
+++ b/common/tct-humanactivitymonitor-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-ime-tizen-tests/inst.apk.py b/common/tct-ime-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-ime-tizen-tests/inst.apk.py
+++ b/common/tct-ime-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ime-tizen-tests/inst.wgt.py b/common/tct-ime-tizen-tests/inst.wgt.py
index 10347d27d5b4d9186792d41501d77bf6cf133808..5edd243439a82190d7ae922c24137b90d839ec77 100755 (executable)
--- a/common/tct-ime-tizen-tests/inst.wgt.py
+++ b/common/tct-ime-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -186,8 +186,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -206,7 +206,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -218,10 +218,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-ime-tizen-tests/inst.xpk.py b/common/tct-ime-tizen-tests/inst.xpk.py
index c904d861abee64276be647b0be529bc56e687fe3..bfed062d78d768bc98bc0a5cca4ddefede4396d0 100755 (executable)
--- a/common/tct-ime-tizen-tests/inst.xpk.py
+++ b/common/tct-ime-tizen-tests/inst.xpk.py
@@ -1,236 +1,236 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/Images" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/Sounds" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/Images" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("%s/*.jpg" % SCRIPT_DIR, "%s/Images" % SRC_DIR):
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/Sounds" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("%s/*.mp3" % SCRIPT_DIR, "%s/Sounds" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/Images" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/Sounds" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/Images" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("%s/*.jpg" % SCRIPT_DIR, "%s/Images" % SRC_DIR):\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/Sounds" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("%s/*.mp3" % SCRIPT_DIR, "%s/Sounds" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ime-tizen-tests/pack.py b/common/tct-ime-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-ime-tizen-tests/pack.py
+++ b/common/tct-ime-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-indexeddb-w3c-tests/inst.apk.py b/common/tct-indexeddb-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-indexeddb-w3c-tests/inst.apk.py
+++ b/common/tct-indexeddb-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-indexeddb-w3c-tests/inst.wgt.py b/common/tct-indexeddb-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-indexeddb-w3c-tests/inst.wgt.py
+++ b/common/tct-indexeddb-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-indexeddb-w3c-tests/inst.xpk.py b/common/tct-indexeddb-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-indexeddb-w3c-tests/inst.xpk.py
+++ b/common/tct-indexeddb-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-indexeddb-w3c-tests/pack.py b/common/tct-indexeddb-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-indexeddb-w3c-tests/pack.py
+++ b/common/tct-indexeddb-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-inputdevice-tizen-tests/inst.apk.py b/common/tct-inputdevice-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-inputdevice-tizen-tests/inst.apk.py
+++ b/common/tct-inputdevice-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-inputdevice-tizen-tests/inst.wgt.py b/common/tct-inputdevice-tizen-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-inputdevice-tizen-tests/inst.wgt.py
+++ b/common/tct-inputdevice-tizen-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-inputdevice-tizen-tests/inst.xpk.py b/common/tct-inputdevice-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-inputdevice-tizen-tests/inst.xpk.py
+++ b/common/tct-inputdevice-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-inputdevice-tizen-tests/pack.py b/common/tct-inputdevice-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-inputdevice-tizen-tests/pack.py
+++ b/common/tct-inputdevice-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-iotcon-tizen-tests/inst.apk.py b/common/tct-iotcon-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-iotcon-tizen-tests/inst.apk.py
+++ b/common/tct-iotcon-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-iotcon-tizen-tests/inst.wgt.py b/common/tct-iotcon-tizen-tests/inst.wgt.py
index 2a5d8ad03ba296b13a1a6cfc9299c52849f2ae22..76475d82bca3772232f361f70273bc34fdd616c3 100755 (executable)
--- a/common/tct-iotcon-tizen-tests/inst.wgt.py
+++ b/common/tct-iotcon-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -192,8 +192,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -212,7 +212,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -224,10 +224,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-iotcon-tizen-tests/inst.xpk.py b/common/tct-iotcon-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-iotcon-tizen-tests/inst.xpk.py
+++ b/common/tct-iotcon-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-iotcon-tizen-tests/pack.py b/common/tct-iotcon-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-iotcon-tizen-tests/pack.py
+++ b/common/tct-iotcon-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-jsenhance-html5-tests/inst.apk.py b/common/tct-jsenhance-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-jsenhance-html5-tests/inst.apk.py
+++ b/common/tct-jsenhance-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-jsenhance-html5-tests/inst.wgt.py b/common/tct-jsenhance-html5-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-jsenhance-html5-tests/inst.wgt.py
+++ b/common/tct-jsenhance-html5-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-jsenhance-html5-tests/inst.xpk.py b/common/tct-jsenhance-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-jsenhance-html5-tests/inst.xpk.py
+++ b/common/tct-jsenhance-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-jsenhance-html5-tests/pack.py b/common/tct-jsenhance-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-jsenhance-html5-tests/pack.py
+++ b/common/tct-jsenhance-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-keymanager-tizen-tests/inst.apk.py b/common/tct-keymanager-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-keymanager-tizen-tests/inst.apk.py
+++ b/common/tct-keymanager-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-keymanager-tizen-tests/inst.wgt.py b/common/tct-keymanager-tizen-tests/inst.wgt.py
index dff1eedb285754c9b87a66d0e67d1e4d7952e9b9..4a54d50a3ab8f734766a1d21c85f820a7baee219 100755 (executable)
--- a/common/tct-keymanager-tizen-tests/inst.wgt.py
+++ b/common/tct-keymanager-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -187,8 +187,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -207,7 +207,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -219,10 +219,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-keymanager-tizen-tests/inst.xpk.py b/common/tct-keymanager-tizen-tests/inst.xpk.py
index bfad76c335abd26e245f17f4e762f4204e93f129..c176aacecc8137256509b07da5d69cfd8adf7991 100755 (executable)
--- a/common/tct-keymanager-tizen-tests/inst.xpk.py
+++ b/common/tct-keymanager-tizen-tests/inst.xpk.py
@@ -1,226 +1,226 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s/Others" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/Others" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s/Others" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/Others" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-keymanager-tizen-tests/pack.py b/common/tct-keymanager-tizen-tests/pack.py
index 08d55aafea37b74455bc394308459ede3844bb7c..92866ab2ed6acacf72d8704056c4c25f4835332a 100755 (executable)
--- a/common/tct-keymanager-tizen-tests/pack.py
+++ b/common/tct-keymanager-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-media-cordova-tests/inst.apk.py b/common/tct-media-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-media-cordova-tests/inst.apk.py
+++ b/common/tct-media-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-media-cordova-tests/inst.wgt.py b/common/tct-media-cordova-tests/inst.wgt.py
index 36c3332761239f253f97edd19106df3282dcdf60..dab477869632b4e8c172d67844d04cb45fe98a81 100755 (executable)
--- a/common/tct-media-cordova-tests/inst.wgt.py
+++ b/common/tct-media-cordova-tests/inst.wgt.py
@@ -1,261 +1,261 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s/Downloads" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith("%s.wgt" % PKG_NAME):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-                action_status = False
-
-    # Do some special copy/delete... steps
-    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "/media/support/tct-media-cordova-tests_audio.mp3"), "%s/Downloads" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-    
-    userCheck()
-    
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s/Downloads" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith("%s.wgt" % PKG_NAME):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+                action_status = False\r
+\r
+    # Do some special copy/delete... steps\r
+    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "/media/support/tct-media-cordova-tests_audio.mp3"), "%s/Downloads" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+    \r
+    userCheck()\r
+    \r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-media-cordova-tests/inst.xpk.py b/common/tct-media-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-media-cordova-tests/inst.xpk.py
+++ b/common/tct-media-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-media-cordova-tests/pack.py b/common/tct-media-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-media-cordova-tests/pack.py
+++ b/common/tct-media-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mediacapture-w3c-tests/inst.apk.py b/common/tct-mediacapture-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mediacapture-w3c-tests/inst.apk.py
+++ b/common/tct-mediacapture-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacapture-w3c-tests/inst.wgt.py b/common/tct-mediacapture-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-mediacapture-w3c-tests/inst.wgt.py
+++ b/common/tct-mediacapture-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacapture-w3c-tests/inst.xpk.py b/common/tct-mediacapture-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-mediacapture-w3c-tests/inst.xpk.py
+++ b/common/tct-mediacapture-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacapture-w3c-tests/pack.py b/common/tct-mediacapture-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mediacapture-w3c-tests/pack.py
+++ b/common/tct-mediacapture-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mediacontroller-tizen-tests/inst.apk.py b/common/tct-mediacontroller-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mediacontroller-tizen-tests/inst.apk.py
+++ b/common/tct-mediacontroller-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacontroller-tizen-tests/inst.wgt.py b/common/tct-mediacontroller-tizen-tests/inst.wgt.py
index f35c72947631f65e55b5c5bacea8ff1214082f2e..1d9d1c8dd38467763fb5ab38df7f18e92179ff70 100755 (executable)
--- a/common/tct-mediacontroller-tizen-tests/inst.wgt.py
+++ b/common/tct-mediacontroller-tizen-tests/inst.wgt.py
@@ -1,233 +1,233 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacontroller-tizen-tests/inst.xpk.py b/common/tct-mediacontroller-tizen-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-mediacontroller-tizen-tests/inst.xpk.py
+++ b/common/tct-mediacontroller-tizen-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediacontroller-tizen-tests/pack.py b/common/tct-mediacontroller-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mediacontroller-tizen-tests/pack.py
+++ b/common/tct-mediacontroller-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mediakey-tizen-tests/inst.apk.py b/common/tct-mediakey-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mediakey-tizen-tests/inst.apk.py
+++ b/common/tct-mediakey-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediakey-tizen-tests/inst.wgt.py b/common/tct-mediakey-tizen-tests/inst.wgt.py
index 44e57cf176811a997dd4abf590ad6d6c821d1835..5322534da626685908b341990530d3d06976154b 100755 (executable)
--- a/common/tct-mediakey-tizen-tests/inst.wgt.py
+++ b/common/tct-mediakey-tizen-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediakey-tizen-tests/inst.xpk.py b/common/tct-mediakey-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-mediakey-tizen-tests/inst.xpk.py
+++ b/common/tct-mediakey-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediakey-tizen-tests/pack.py b/common/tct-mediakey-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mediakey-tizen-tests/pack.py
+++ b/common/tct-mediakey-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mediaqueries-css3-tests/inst.apk.py b/common/tct-mediaqueries-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mediaqueries-css3-tests/inst.apk.py
+++ b/common/tct-mediaqueries-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediaqueries-css3-tests/inst.wgt.py b/common/tct-mediaqueries-css3-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-mediaqueries-css3-tests/inst.wgt.py
+++ b/common/tct-mediaqueries-css3-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediaqueries-css3-tests/inst.xpk.py b/common/tct-mediaqueries-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-mediaqueries-css3-tests/inst.xpk.py
+++ b/common/tct-mediaqueries-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mediaqueries-css3-tests/pack.py b/common/tct-mediaqueries-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mediaqueries-css3-tests/pack.py
+++ b/common/tct-mediaqueries-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-messageport-tizen-tests/inst.apk.py b/common/tct-messageport-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-messageport-tizen-tests/inst.apk.py
+++ b/common/tct-messageport-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messageport-tizen-tests/inst.wgt.py b/common/tct-messageport-tizen-tests/inst.wgt.py
index 244c4552d1c741d565bee7fc8d9908380d8a7893..21c27d4edf1dd2b8dcce562419d3abf8b05b8970 100755 (executable)
--- a/common/tct-messageport-tizen-tests/inst.wgt.py
+++ b/common/tct-messageport-tizen-tests/inst.wgt.py
@@ -1,234 +1,234 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    (return_code, output) = doRemoteCMD(
-        "app_launcher -s bd2Z8dYMp1.MessagePortHelper")
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    (return_code, output) = doRemoteCMD(\r
+        "app_launcher -s bd2Z8dYMp1.MessagePortHelper")\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messageport-tizen-tests/inst.xpk.py b/common/tct-messageport-tizen-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-messageport-tizen-tests/inst.xpk.py
+++ b/common/tct-messageport-tizen-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messageport-tizen-tests/pack.py b/common/tct-messageport-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-messageport-tizen-tests/pack.py
+++ b/common/tct-messageport-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-messaging-email-tizen-tests/inst.apk.py b/common/tct-messaging-email-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-messaging-email-tizen-tests/inst.apk.py
+++ b/common/tct-messaging-email-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-email-tizen-tests/inst.wgt.py b/common/tct-messaging-email-tizen-tests/inst.wgt.py
index ea1c0dfa326bd5b92d10453f6f4dce8fe874ab39..ec51f5207bf54074bbf9c9f8f9c44d091daddbe5 100755 (executable)
--- a/common/tct-messaging-email-tizen-tests/inst.wgt.py
+++ b/common/tct-messaging-email-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -207,8 +207,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -227,7 +227,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -239,10 +239,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-messaging-email-tizen-tests/inst.xpk.py b/common/tct-messaging-email-tizen-tests/inst.xpk.py
index 2b5e3f2e1645d072aa408f8ea5bac2e434f728a8..e4dff9a998e7a9f87bc6a29db288780b831fbb13 100755 (executable)
--- a/common/tct-messaging-email-tizen-tests/inst.xpk.py
+++ b/common/tct-messaging-email-tizen-tests/inst.xpk.py
@@ -1,227 +1,227 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    for item in os.listdir(SCRIPT_DIR):
-        if item.find("webapi-tizen-appcontrol-test_") != -1:
-            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    for item in os.listdir(SCRIPT_DIR):\r
+        if item.find("webapi-tizen-appcontrol-test_") != -1:\r
+            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-email-tizen-tests/pack.py b/common/tct-messaging-email-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-messaging-email-tizen-tests/pack.py
+++ b/common/tct-messaging-email-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-messaging-mms-tizen-tests/inst.apk.py b/common/tct-messaging-mms-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-messaging-mms-tizen-tests/inst.apk.py
+++ b/common/tct-messaging-mms-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-mms-tizen-tests/inst.wgt.py b/common/tct-messaging-mms-tizen-tests/inst.wgt.py
index 71805b47fdf5650675c5558408bf87691f582d96..fd2e87dda5143cb6fef5d2d08594d2bf2c75c2f9 100755 (executable)
--- a/common/tct-messaging-mms-tizen-tests/inst.wgt.py
+++ b/common/tct-messaging-mms-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-messaging-mms-tizen-tests/inst.xpk.py b/common/tct-messaging-mms-tizen-tests/inst.xpk.py
index 2b5e3f2e1645d072aa408f8ea5bac2e434f728a8..e4dff9a998e7a9f87bc6a29db288780b831fbb13 100755 (executable)
--- a/common/tct-messaging-mms-tizen-tests/inst.xpk.py
+++ b/common/tct-messaging-mms-tizen-tests/inst.xpk.py
@@ -1,227 +1,227 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    for item in os.listdir(SCRIPT_DIR):
-        if item.find("webapi-tizen-appcontrol-test_") != -1:
-            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD("mkdir -p %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    for item in os.listdir(SCRIPT_DIR):\r
+        if item.find("webapi-tizen-appcontrol-test_") != -1:\r
+            if not doRemoteCopy("%s/%s" % (SCRIPT_DIR, item), "%s/%s/%s" % (SRC_DIR, PKG_NAME, item)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-mms-tizen-tests/pack.py b/common/tct-messaging-mms-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-messaging-mms-tizen-tests/pack.py
+++ b/common/tct-messaging-mms-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-messaging-sms-tizen-tests/inst.apk.py b/common/tct-messaging-sms-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-messaging-sms-tizen-tests/inst.apk.py
+++ b/common/tct-messaging-sms-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-sms-tizen-tests/inst.wgt.py b/common/tct-messaging-sms-tizen-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/common/tct-messaging-sms-tizen-tests/inst.wgt.py
+++ b/common/tct-messaging-sms-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-messaging-sms-tizen-tests/inst.xpk.py b/common/tct-messaging-sms-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-messaging-sms-tizen-tests/inst.xpk.py
+++ b/common/tct-messaging-sms-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-messaging-sms-tizen-tests/pack.py b/common/tct-messaging-sms-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-messaging-sms-tizen-tests/pack.py
+++ b/common/tct-messaging-sms-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-metadata-tizen-tests/inst.apk.py b/common/tct-metadata-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-metadata-tizen-tests/inst.apk.py
+++ b/common/tct-metadata-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-metadata-tizen-tests/inst.wgt.py b/common/tct-metadata-tizen-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-metadata-tizen-tests/inst.wgt.py
+++ b/common/tct-metadata-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-metadata-tizen-tests/inst.xpk.py b/common/tct-metadata-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-metadata-tizen-tests/inst.xpk.py
+++ b/common/tct-metadata-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-metadata-tizen-tests/pack.py b/common/tct-metadata-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-metadata-tizen-tests/pack.py
+++ b/common/tct-metadata-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-ml-tizen-tests/inst.apk.py b/common/tct-ml-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-ml-tizen-tests/inst.apk.py
+++ b/common/tct-ml-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ml-tizen-tests/inst.wgt.py b/common/tct-ml-tizen-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-ml-tizen-tests/inst.wgt.py
+++ b/common/tct-ml-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-ml-tizen-tests/inst.xpk.py b/common/tct-ml-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-ml-tizen-tests/inst.xpk.py
+++ b/common/tct-ml-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ml-tizen-tests/pack.py b/common/tct-ml-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-ml-tizen-tests/pack.py
+++ b/common/tct-ml-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mlpipeline-tizen-tests/inst.apk.py b/common/tct-mlpipeline-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mlpipeline-tizen-tests/inst.apk.py
+++ b/common/tct-mlpipeline-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mlpipeline-tizen-tests/inst.wgt.py b/common/tct-mlpipeline-tizen-tests/inst.wgt.py
index 70534429f792a7e9ce70758f0450468097a1fe79..ecdac7ff6768250380aa10ed74f64066d84bf6f8 100755 (executable)
--- a/common/tct-mlpipeline-tizen-tests/inst.wgt.py
+++ b/common/tct-mlpipeline-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -204,8 +204,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -224,7 +224,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -236,10 +236,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-mlpipeline-tizen-tests/inst.xpk.py b/common/tct-mlpipeline-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-mlpipeline-tizen-tests/inst.xpk.py
+++ b/common/tct-mlpipeline-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mlpipeline-tizen-tests/pack.py b/common/tct-mlpipeline-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mlpipeline-tizen-tests/pack.py
+++ b/common/tct-mlpipeline-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mlsingleshot-tizen-tests/inst.apk.py b/common/tct-mlsingleshot-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mlsingleshot-tizen-tests/inst.apk.py
+++ b/common/tct-mlsingleshot-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mlsingleshot-tizen-tests/inst.wgt.py b/common/tct-mlsingleshot-tizen-tests/inst.wgt.py
index 39ee7a0c0be2296871c0fc32e19e4c840ecac59c..1459d2c88e569b424ea6d5db25fcffff4f04a42f 100755 (executable)
--- a/common/tct-mlsingleshot-tizen-tests/inst.wgt.py
+++ b/common/tct-mlsingleshot-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -219,8 +219,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -239,7 +239,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -251,10 +251,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-mlsingleshot-tizen-tests/inst.xpk.py b/common/tct-mlsingleshot-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-mlsingleshot-tizen-tests/inst.xpk.py
+++ b/common/tct-mlsingleshot-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mlsingleshot-tizen-tests/pack.py b/common/tct-mlsingleshot-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-mlsingleshot-tizen-tests/pack.py
+++ b/common/tct-mlsingleshot-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-mse-w3c-tests/inst.apk.py b/common/tct-mse-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-mse-w3c-tests/inst.apk.py
+++ b/common/tct-mse-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mse-w3c-tests/inst.wgt.py b/common/tct-mse-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-mse-w3c-tests/inst.wgt.py
+++ b/common/tct-mse-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mse-w3c-tests/inst.xpk.py b/common/tct-mse-w3c-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-mse-w3c-tests/inst.xpk.py
+++ b/common/tct-mse-w3c-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-mse-w3c-tests/pack.py b/common/tct-mse-w3c-tests/pack.py
index d2ee57294ba664b1971288d87dbd7168c38d834f..134a17a077f2a5805b6f59bbf21b4a34654fa59d 100755 (executable)
--- a/common/tct-mse-w3c-tests/pack.py
+++ b/common/tct-mse-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-multicolumn-css3-tests/inst.apk.py b/common/tct-multicolumn-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/inst.apk.py
+++ b/common/tct-multicolumn-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-multicolumn-css3-tests/inst.wgt.py b/common/tct-multicolumn-css3-tests/inst.wgt.py
index c7f89fd44607b570bbcae5447b935557cf8e590b..909755af3b4e03918ae3823bc036ddf994a43999 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/inst.wgt.py
+++ b/common/tct-multicolumn-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-multicolumn-css3-tests/inst.xpk.py b/common/tct-multicolumn-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/inst.xpk.py
+++ b/common/tct-multicolumn-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-multicolumn-css3-tests/pack.py b/common/tct-multicolumn-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-multicolumn-css3-tests/pack.py
+++ b/common/tct-multicolumn-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-namespace-tizen-tests/inst.apk.py b/common/tct-namespace-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-namespace-tizen-tests/inst.apk.py
+++ b/common/tct-namespace-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-namespace-tizen-tests/inst.wgt.py b/common/tct-namespace-tizen-tests/inst.wgt.py
index 44e57cf176811a997dd4abf590ad6d6c821d1835..5322534da626685908b341990530d3d06976154b 100755 (executable)
--- a/common/tct-namespace-tizen-tests/inst.wgt.py
+++ b/common/tct-namespace-tizen-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-namespace-tizen-tests/inst.xpk.py b/common/tct-namespace-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-namespace-tizen-tests/inst.xpk.py
+++ b/common/tct-namespace-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-namespace-tizen-tests/pack.py b/common/tct-namespace-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-namespace-tizen-tests/pack.py
+++ b/common/tct-namespace-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-navigationtiming-w3c-tests/inst.apk.py b/common/tct-navigationtiming-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-navigationtiming-w3c-tests/inst.apk.py
+++ b/common/tct-navigationtiming-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-navigationtiming-w3c-tests/inst.wgt.py b/common/tct-navigationtiming-w3c-tests/inst.wgt.py
index dd614f26548aab1c49ce4a34e3e02b05ef5e4971..b30f310f466b83085a7761c6cf6c03fa851ab479 100755 (executable)
--- a/common/tct-navigationtiming-w3c-tests/inst.wgt.py
+++ b/common/tct-navigationtiming-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -215,10 +215,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-navigationtiming-w3c-tests/inst.xpk.py b/common/tct-navigationtiming-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-navigationtiming-w3c-tests/inst.xpk.py
+++ b/common/tct-navigationtiming-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-navigationtiming-w3c-tests/pack.py b/common/tct-navigationtiming-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-navigationtiming-w3c-tests/pack.py
+++ b/common/tct-navigationtiming-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-network-information-cordova-tests/inst.apk.py b/common/tct-network-information-cordova-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-network-information-cordova-tests/inst.apk.py
+++ b/common/tct-network-information-cordova-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-network-information-cordova-tests/inst.wgt.py b/common/tct-network-information-cordova-tests/inst.wgt.py
index 128023f51874e45e980936a687da1da15114c34b..76e09e51869327c8e2f7d2fa1eea4178d4fe3124 100755 (executable)
--- a/common/tct-network-information-cordova-tests/inst.wgt.py
+++ b/common/tct-network-information-cordova-tests/inst.wgt.py
@@ -1,252 +1,252 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith("%s.wgt" % PKG_NAME):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith("%s.wgt" % PKG_NAME):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-network-information-cordova-tests/inst.xpk.py b/common/tct-network-information-cordova-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-network-information-cordova-tests/inst.xpk.py
+++ b/common/tct-network-information-cordova-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-network-information-cordova-tests/pack.py b/common/tct-network-information-cordova-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-network-information-cordova-tests/pack.py
+++ b/common/tct-network-information-cordova-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-networkbearerselection-tizen-tests/inst.apk.py b/common/tct-networkbearerselection-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-networkbearerselection-tizen-tests/inst.apk.py
+++ b/common/tct-networkbearerselection-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-networkbearerselection-tizen-tests/inst.wgt.py b/common/tct-networkbearerselection-tizen-tests/inst.wgt.py
index dc5e8b8b3b44d332f5bafdfa76849620596a137e..8b5d2f8a89d17eb806b0eb5b8dc8e7101b103472 100755 (executable)
--- a/common/tct-networkbearerselection-tizen-tests/inst.wgt.py
+++ b/common/tct-networkbearerselection-tizen-tests/inst.wgt.py
@@ -1,239 +1,239 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-networkbearerselection-tizen-tests/inst.xpk.py b/common/tct-networkbearerselection-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-networkbearerselection-tizen-tests/inst.xpk.py
+++ b/common/tct-networkbearerselection-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-networkbearerselection-tizen-tests/pack.py b/common/tct-networkbearerselection-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-networkbearerselection-tizen-tests/pack.py
+++ b/common/tct-networkbearerselection-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-nfc-tizen-tests/inst.apk.py b/common/tct-nfc-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-nfc-tizen-tests/inst.apk.py
+++ b/common/tct-nfc-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-nfc-tizen-tests/inst.wgt.py b/common/tct-nfc-tizen-tests/inst.wgt.py
index 2dd4ce674b3eb0d5cb1c1efafbdd2ca5f564ab2a..bce7972e2d9bc4dbbbfbd904ab94ffca757697d9 100755 (executable)
--- a/common/tct-nfc-tizen-tests/inst.wgt.py
+++ b/common/tct-nfc-tizen-tests/inst.wgt.py
@@ -1,249 +1,249 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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") or file.endswith(".tpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    #(return_code, output) = doRemoteCMD(
-     #   "rm /home/owner/share/org.tizen.tbt_hcetestappa-1.0.0-arm.tpk")
-   # (return_code, output) = doRemoteCMD(
-    #    "rm /home/owner/share/nfcTest.wgt")
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-        for file in files:
-            if file.endswith(".tpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -i -t tpk -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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    #if not doRemoteCopy(os.path.join(SCRIPT_DIR, "nfcTest"), "/home/owner/share"):
-     #   action_status = False
-    #(return_code, output) = doRemoteCMD(
-     #   "su - %s -c '%s;app_launcher -s cM2gZdtzOg.nfcTest'" % (PARAMETERS.user, XW_ENV))
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt") or file.endswith(".tpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -q -u -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    #(return_code, output) = doRemoteCMD(\r
+     #   "rm /home/owner/share/org.tizen.tbt_hcetestappa-1.0.0-arm.tpk")\r
+   # (return_code, output) = doRemoteCMD(\r
+    #    "rm /home/owner/share/nfcTest.wgt")\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+        for file in files:\r
+            if file.endswith(".tpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t tpk -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    #if not doRemoteCopy(os.path.join(SCRIPT_DIR, "nfcTest"), "/home/owner/share"):\r
+     #   action_status = False\r
+    #(return_code, output) = doRemoteCMD(\r
+     #   "su - %s -c '%s;app_launcher -s cM2gZdtzOg.nfcTest'" % (PARAMETERS.user, XW_ENV))\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-nfc-tizen-tests/inst.xpk.py b/common/tct-nfc-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-nfc-tizen-tests/inst.xpk.py
+++ b/common/tct-nfc-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-nfc-tizen-tests/pack.py b/common/tct-nfc-tizen-tests/pack.py
index 0ba04d0375ba7c3d95e4a8bc1f610fbaea8f0fbe..ed803130a5ee1a2be69c5ac932b4fd1d47922361 100755 (executable)
--- a/common/tct-nfc-tizen-tests/pack.py
+++ b/common/tct-nfc-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -940,7 +940,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-notification-tizen-tests/inst.apk.py b/common/tct-notification-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-notification-tizen-tests/inst.apk.py
+++ b/common/tct-notification-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-notification-tizen-tests/inst.wgt.py b/common/tct-notification-tizen-tests/inst.wgt.py
index 802b9e785ce29781f143c66db79cf045dfb6dfe5..d40f6c0d4f2c1f81350c3e93335113c8fdf42cb5 100755 (executable)
--- a/common/tct-notification-tizen-tests/inst.wgt.py
+++ b/common/tct-notification-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -197,8 +197,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -217,7 +217,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -229,10 +229,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-notification-tizen-tests/inst.xpk.py b/common/tct-notification-tizen-tests/inst.xpk.py
index c904d861abee64276be647b0be529bc56e687fe3..7e0d91324ea5602917d2efd3ab3125e7f8a7e224 100755 (executable)
--- a/common/tct-notification-tizen-tests/inst.xpk.py
+++ b/common/tct-notification-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -218,10 +218,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-notification-tizen-tests/pack.py b/common/tct-notification-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-notification-tizen-tests/pack.py
+++ b/common/tct-notification-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-notification-w3c-tests/inst.apk.py b/common/tct-notification-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-notification-w3c-tests/inst.apk.py
+++ b/common/tct-notification-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-notification-w3c-tests/inst.wgt.py b/common/tct-notification-w3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-notification-w3c-tests/inst.wgt.py
+++ b/common/tct-notification-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-notification-w3c-tests/inst.xpk.py b/common/tct-notification-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-notification-w3c-tests/inst.xpk.py
+++ b/common/tct-notification-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-notification-w3c-tests/pack.py b/common/tct-notification-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-notification-w3c-tests/pack.py
+++ b/common/tct-notification-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-package-tizen-tests/inst.apk.py b/common/tct-package-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-package-tizen-tests/inst.apk.py
+++ b/common/tct-package-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-package-tizen-tests/inst.wgt.py b/common/tct-package-tizen-tests/inst.wgt.py
index 26774c69d423e4113e1cab1157a30aad78a6ac7e..8f8ca1b7c07a987e566bd68d0ca81686b9d16fe6 100755 (executable)
--- a/common/tct-package-tizen-tests/inst.wgt.py
+++ b/common/tct-package-tizen-tests/inst.wgt.py
@@ -1,239 +1,239 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s/Others" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    if not doRemoteCopy("%s/mediasrc" % SCRIPT_DIR, "%s/Others" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s/Others" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    if not doRemoteCopy("%s/mediasrc" % SCRIPT_DIR, "%s/Others" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-package-tizen-tests/inst.xpk.py b/common/tct-package-tizen-tests/inst.xpk.py
index 22a25cec50e339d38ea70c17c10280b55e4b8a98..911e9eb7897d3fd6dbe06d9202f703f1e83ebf3e 100755 (executable)
--- a/common/tct-package-tizen-tests/inst.xpk.py
+++ b/common/tct-package-tizen-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s/Others" % SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    if not doRemoteCopy("%s/mediasrc" % SCRIPT_DIR, "%s/Others" % SRC_DIR):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s/Others" % SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    if not doRemoteCopy("%s/mediasrc" % SCRIPT_DIR, "%s/Others" % SRC_DIR):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-package-tizen-tests/pack.py b/common/tct-package-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-package-tizen-tests/pack.py
+++ b/common/tct-package-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-pagevisibility-w3c-tests/inst.apk.py b/common/tct-pagevisibility-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-pagevisibility-w3c-tests/inst.apk.py
+++ b/common/tct-pagevisibility-w3c-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-pagevisibility-w3c-tests/inst.wgt.py b/common/tct-pagevisibility-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..670f31e952fb5e42f1a9ba0b077946f5c8a3fa7e 100755 (executable)
--- a/common/tct-pagevisibility-w3c-tests/inst.wgt.py
+++ b/common/tct-pagevisibility-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -32,14 +32,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -190,8 +190,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -210,7 +210,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -222,10 +222,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-pagevisibility-w3c-tests/inst.xpk.py b/common/tct-pagevisibility-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/common/tct-pagevisibility-w3c-tests/inst.xpk.py
+++ b/common/tct-pagevisibility-w3c-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-pagevisibility-w3c-tests/pack.py b/common/tct-pagevisibility-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-pagevisibility-w3c-tests/pack.py
+++ b/common/tct-pagevisibility-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-playerutil-tizen-tests/inst.apk.py b/common/tct-playerutil-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-playerutil-tizen-tests/inst.apk.py
+++ b/common/tct-playerutil-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-playerutil-tizen-tests/inst.wgt.py b/common/tct-playerutil-tizen-tests/inst.wgt.py
index c7f89fd44607b570bbcae5447b935557cf8e590b..909755af3b4e03918ae3823bc036ddf994a43999 100755 (executable)
--- a/common/tct-playerutil-tizen-tests/inst.wgt.py
+++ b/common/tct-playerutil-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-playerutil-tizen-tests/inst.xpk.py b/common/tct-playerutil-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-playerutil-tizen-tests/inst.xpk.py
+++ b/common/tct-playerutil-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-playerutil-tizen-tests/pack.py b/common/tct-playerutil-tizen-tests/pack.py
index 08d55aafea37b74455bc394308459ede3844bb7c..92866ab2ed6acacf72d8704056c4c25f4835332a 100755 (executable)
--- a/common/tct-playerutil-tizen-tests/pack.py
+++ b/common/tct-playerutil-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-power-tizen-tests/inst.apk.py b/common/tct-power-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-power-tizen-tests/inst.apk.py
+++ b/common/tct-power-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-power-tizen-tests/inst.wgt.py b/common/tct-power-tizen-tests/inst.wgt.py
index ca95382d7ab9d7f070462fc69040d7ff22ab55ad..eb549d398a7b21a446ff145bc38cea924571c776 100755 (executable)
--- a/common/tct-power-tizen-tests/inst.wgt.py
+++ b/common/tct-power-tizen-tests/inst.wgt.py
@@ -1,245 +1,245 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    (return_code, output) = doRemoteCMD(
-        "vconftool set -t int db/setting/lcd_backlight_normal 0 -f")
-    (return_code, output) = doRemoteCMD(
-        "vconftool set -t int db/setting/screen_lock_type 0 -f")
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    (return_code, output) = doRemoteCMD(\r
+        "vconftool set -t int db/setting/lcd_backlight_normal 0 -f")\r
+    (return_code, output) = doRemoteCMD(\r
+        "vconftool set -t int db/setting/screen_lock_type 0 -f")\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-power-tizen-tests/inst.xpk.py b/common/tct-power-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-power-tizen-tests/inst.xpk.py
+++ b/common/tct-power-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-power-tizen-tests/pack.py b/common/tct-power-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-power-tizen-tests/pack.py
+++ b/common/tct-power-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-preference-tizen-tests/inst.apk.py b/common/tct-preference-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-preference-tizen-tests/inst.apk.py
+++ b/common/tct-preference-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-preference-tizen-tests/inst.wgt.py b/common/tct-preference-tizen-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-preference-tizen-tests/inst.wgt.py
+++ b/common/tct-preference-tizen-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-preference-tizen-tests/inst.xpk.py b/common/tct-preference-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-preference-tizen-tests/inst.xpk.py
+++ b/common/tct-preference-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-preference-tizen-tests/pack.py b/common/tct-preference-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-preference-tizen-tests/pack.py
+++ b/common/tct-preference-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-privacyprivilege-tizen-tests/inst.apk.py b/common/tct-privacyprivilege-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-privacyprivilege-tizen-tests/inst.apk.py
+++ b/common/tct-privacyprivilege-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-privacyprivilege-tizen-tests/inst.wgt.py b/common/tct-privacyprivilege-tizen-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/common/tct-privacyprivilege-tizen-tests/inst.wgt.py
+++ b/common/tct-privacyprivilege-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-privacyprivilege-tizen-tests/inst.xpk.py b/common/tct-privacyprivilege-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-privacyprivilege-tizen-tests/inst.xpk.py
+++ b/common/tct-privacyprivilege-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-privacyprivilege-tizen-tests/pack.py b/common/tct-privacyprivilege-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-privacyprivilege-tizen-tests/pack.py
+++ b/common/tct-privacyprivilege-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-privilege-tizen-tests/inst.apk.py b/common/tct-privilege-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-privilege-tizen-tests/inst.apk.py
+++ b/common/tct-privilege-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-privilege-tizen-tests/inst.wgt.py b/common/tct-privilege-tizen-tests/inst.wgt.py
index 44e57cf176811a997dd4abf590ad6d6c821d1835..5322534da626685908b341990530d3d06976154b 100755 (executable)
--- a/common/tct-privilege-tizen-tests/inst.wgt.py
+++ b/common/tct-privilege-tizen-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-privilege-tizen-tests/inst.xpk.py b/common/tct-privilege-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-privilege-tizen-tests/inst.xpk.py
+++ b/common/tct-privilege-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-privilege-tizen-tests/pack.py b/common/tct-privilege-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-privilege-tizen-tests/pack.py
+++ b/common/tct-privilege-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-push-tizen-tests/inst.apk.py b/common/tct-push-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-push-tizen-tests/inst.apk.py
+++ b/common/tct-push-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-push-tizen-tests/inst.wgt.py b/common/tct-push-tizen-tests/inst.wgt.py
index e32732b340da4841aa7a480e4c2e53dbd8f4b635..8e0d9ef1ac5649b442f894d42aea36e60df8bd95 100755 (executable)
--- a/common/tct-push-tizen-tests/inst.wgt.py
+++ b/common/tct-push-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-push-tizen-tests/inst.xpk.py b/common/tct-push-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-push-tizen-tests/inst.xpk.py
+++ b/common/tct-push-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-push-tizen-tests/pack.py b/common/tct-push-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-push-tizen-tests/pack.py
+++ b/common/tct-push-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-push-w3c-tests/inst.apk.py b/common/tct-push-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/common/tct-push-w3c-tests/inst.apk.py
+++ b/common/tct-push-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-push-w3c-tests/inst.wgt.py b/common/tct-push-w3c-tests/inst.wgt.py
index 145211488f64c080a91702f338bce3033501800f..36be2eb51f034efa9ca66695224cea7fbc508bea 100755 (executable)
--- a/common/tct-push-w3c-tests/inst.wgt.py
+++ b/common/tct-push-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-push-w3c-tests/inst.xpk.py b/common/tct-push-w3c-tests/inst.xpk.py
index 85b97b93f3df9dcbf5084565c37ed0fbb7f52b1f..3c5075e3ec1c0086d2aea1c9b823d74f876ffc99 100755 (executable)
--- a/common/tct-push-w3c-tests/inst.xpk.py
+++ b/common/tct-push-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-push-w3c-tests/pack.py b/common/tct-push-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-push-w3c-tests/pack.py
+++ b/common/tct-push-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-sandbox-html5-tests/inst.apk.py b/common/tct-sandbox-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-sandbox-html5-tests/inst.apk.py
+++ b/common/tct-sandbox-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sandbox-html5-tests/inst.wgt.py b/common/tct-sandbox-html5-tests/inst.wgt.py
index 9c17c1ad72abe8efd6676db89600e7198bd680af..d442317ad901dd9c07ded27b4de2ff2d47dcba45 100755 (executable)
--- a/common/tct-sandbox-html5-tests/inst.wgt.py
+++ b/common/tct-sandbox-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -185,8 +185,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -205,7 +205,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -217,10 +217,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-sandbox-html5-tests/inst.xpk.py b/common/tct-sandbox-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-sandbox-html5-tests/inst.xpk.py
+++ b/common/tct-sandbox-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sandbox-html5-tests/pack.py b/common/tct-sandbox-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-sandbox-html5-tests/pack.py
+++ b/common/tct-sandbox-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-screenorientation-w3c-tests/inst.apk.py b/common/tct-screenorientation-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-screenorientation-w3c-tests/inst.apk.py
+++ b/common/tct-screenorientation-w3c-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-screenorientation-w3c-tests/inst.wgt.py b/common/tct-screenorientation-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..670f31e952fb5e42f1a9ba0b077946f5c8a3fa7e 100755 (executable)
--- a/common/tct-screenorientation-w3c-tests/inst.wgt.py
+++ b/common/tct-screenorientation-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -32,14 +32,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -190,8 +190,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -210,7 +210,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -222,10 +222,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-screenorientation-w3c-tests/inst.xpk.py b/common/tct-screenorientation-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/common/tct-screenorientation-w3c-tests/inst.xpk.py
+++ b/common/tct-screenorientation-w3c-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-screenorientation-w3c-tests/pack.py b/common/tct-screenorientation-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-screenorientation-w3c-tests/pack.py
+++ b/common/tct-screenorientation-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-secureelement-tizen-tests/inst.apk.py b/common/tct-secureelement-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-secureelement-tizen-tests/inst.apk.py
+++ b/common/tct-secureelement-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-secureelement-tizen-tests/inst.wgt.py b/common/tct-secureelement-tizen-tests/inst.wgt.py
index d4d5dc5df222911d2013bc04ea5ee9a203ff80d9..d88ca18903f0223ed2bbc3255a33282eeb86e29e 100755 (executable)
--- a/common/tct-secureelement-tizen-tests/inst.wgt.py
+++ b/common/tct-secureelement-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -202,8 +202,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -222,7 +222,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -234,10 +234,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-secureelement-tizen-tests/inst.xpk.py b/common/tct-secureelement-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-secureelement-tizen-tests/inst.xpk.py
+++ b/common/tct-secureelement-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-secureelement-tizen-tests/pack.py b/common/tct-secureelement-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-secureelement-tizen-tests/pack.py
+++ b/common/tct-secureelement-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-security-tcs-tests/inst.apk.py b/common/tct-security-tcs-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-security-tcs-tests/inst.apk.py
+++ b/common/tct-security-tcs-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-security-tcs-tests/inst.wgt.py b/common/tct-security-tcs-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-security-tcs-tests/inst.wgt.py
+++ b/common/tct-security-tcs-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-security-tcs-tests/inst.xpk.py b/common/tct-security-tcs-tests/inst.xpk.py
index c0c358eccbe00400cf69651e2937542462b771d2..34a9d92c36c7de32dda454d634bc849fdea0cc0d 100755 (executable)
--- a/common/tct-security-tcs-tests/inst.xpk.py
+++ b/common/tct-security-tcs-tests/inst.xpk.py
@@ -1,214 +1,214 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-security-tcs-tests/pack.py b/common/tct-security-tcs-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-security-tcs-tests/pack.py
+++ b/common/tct-security-tcs-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-selectorslevel1-w3c-tests/inst.apk.py b/common/tct-selectorslevel1-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-selectorslevel1-w3c-tests/inst.apk.py
+++ b/common/tct-selectorslevel1-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel1-w3c-tests/inst.wgt.py b/common/tct-selectorslevel1-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-selectorslevel1-w3c-tests/inst.wgt.py
+++ b/common/tct-selectorslevel1-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel1-w3c-tests/inst.xpk.py b/common/tct-selectorslevel1-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-selectorslevel1-w3c-tests/inst.xpk.py
+++ b/common/tct-selectorslevel1-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel1-w3c-tests/pack.py b/common/tct-selectorslevel1-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-selectorslevel1-w3c-tests/pack.py
+++ b/common/tct-selectorslevel1-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-selectorslevel2-w3c-tests/inst.apk.py b/common/tct-selectorslevel2-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-selectorslevel2-w3c-tests/inst.apk.py
+++ b/common/tct-selectorslevel2-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel2-w3c-tests/inst.wgt.py b/common/tct-selectorslevel2-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-selectorslevel2-w3c-tests/inst.wgt.py
+++ b/common/tct-selectorslevel2-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel2-w3c-tests/inst.xpk.py b/common/tct-selectorslevel2-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-selectorslevel2-w3c-tests/inst.xpk.py
+++ b/common/tct-selectorslevel2-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-selectorslevel2-w3c-tests/pack.py b/common/tct-selectorslevel2-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-selectorslevel2-w3c-tests/pack.py
+++ b/common/tct-selectorslevel2-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-sensor-tizen-tests/inst.apk.py b/common/tct-sensor-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-sensor-tizen-tests/inst.apk.py
+++ b/common/tct-sensor-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sensor-tizen-tests/inst.wgt.py b/common/tct-sensor-tizen-tests/inst.wgt.py
index 3ef2cf1df3d914a3055c3dd1d504f367d745c51a..73deb8f0c621f9bac4fe40be514f1e68476c3f57 100755 (executable)
--- a/common/tct-sensor-tizen-tests/inst.wgt.py
+++ b/common/tct-sensor-tizen-tests/inst.wgt.py
@@ -1,258 +1,258 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            #askpolicyremoving()
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def askpolicyremoving():\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+   \r
+    print (pkg_id)\r
+    print (os.getcwd())\r
+    print (os.path.dirname(os.path.realpath(__file__)) )\r
+    if not doRemoteCopy("%s/askpolicy.sh" % SCRIPT_DIR, "%s" % (SRC_DIR)):\r
+        action_status = False\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell .%s/askpolicy.sh %s" % (PARAMETERS.device, \r
+        SRC_DIR, pkg_id)\r
+    return doCMD(cmd)\r
+       \r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            #askpolicyremoving()\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sensor-tizen-tests/inst.xpk.py b/common/tct-sensor-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-sensor-tizen-tests/inst.xpk.py
+++ b/common/tct-sensor-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sensor-tizen-tests/pack.py b/common/tct-sensor-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-sensor-tizen-tests/pack.py
+++ b/common/tct-sensor-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-serviceworkers-w3c-tests/inst.apk.py b/common/tct-serviceworkers-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-serviceworkers-w3c-tests/inst.apk.py
+++ b/common/tct-serviceworkers-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-serviceworkers-w3c-tests/inst.wgt.py b/common/tct-serviceworkers-w3c-tests/inst.wgt.py
index f0baddaf54621f642052088f897fa0f893e4e033..4047f19c88abd211d2e846da88ff53fc5a8deba9 100755 (executable)
--- a/common/tct-serviceworkers-w3c-tests/inst.wgt.py
+++ b/common/tct-serviceworkers-w3c-tests/inst.wgt.py
@@ -1,235 +1,235 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-serviceworkers-w3c-tests/inst.xpk.py b/common/tct-serviceworkers-w3c-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-serviceworkers-w3c-tests/inst.xpk.py
+++ b/common/tct-serviceworkers-w3c-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-serviceworkers-w3c-tests/pack.py b/common/tct-serviceworkers-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-serviceworkers-w3c-tests/pack.py
+++ b/common/tct-serviceworkers-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-sessionhistory-html5-tests/inst.apk.py b/common/tct-sessionhistory-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-sessionhistory-html5-tests/inst.apk.py
+++ b/common/tct-sessionhistory-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sessionhistory-html5-tests/inst.wgt.py b/common/tct-sessionhistory-html5-tests/inst.wgt.py
index 7a271b8beb23eb18de52d3f53c2921ac7da931bb..6926e5a0a1552d0ed25d6f41fd60bdb3c6e8f455 100755 (executable)
--- a/common/tct-sessionhistory-html5-tests/inst.wgt.py
+++ b/common/tct-sessionhistory-html5-tests/inst.wgt.py
@@ -1,239 +1,239 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-    for item in glob.glob("%s/sessionhistory/w3c/cgi/*" % SCRIPT_DIR):
-        item_name = os.path.basename(item)
-        if not doRemoteCopy(item, "%s/sessionhistory/w3c/%s" % (PKG_SRC_DIR, item_name)):
-        #if not doRemoteCopy(item, PKG_SRC_DIR):
-            action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+    for item in glob.glob("%s/sessionhistory/w3c/cgi/*" % SCRIPT_DIR):\r
+        item_name = os.path.basename(item)\r
+        if not doRemoteCopy(item, "%s/sessionhistory/w3c/%s" % (PKG_SRC_DIR, item_name)):\r
+        #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+            action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sessionhistory-html5-tests/inst.xpk.py b/common/tct-sessionhistory-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-sessionhistory-html5-tests/inst.xpk.py
+++ b/common/tct-sessionhistory-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sessionhistory-html5-tests/pack.py b/common/tct-sessionhistory-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-sessionhistory-html5-tests/pack.py
+++ b/common/tct-sessionhistory-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-sound-tizen-tests/inst.apk.py b/common/tct-sound-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-sound-tizen-tests/inst.apk.py
+++ b/common/tct-sound-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sound-tizen-tests/inst.wgt.py b/common/tct-sound-tizen-tests/inst.wgt.py
index 18690763e66ef8bdab827e9de7d7691a83ab6d80..5bbb418f3c213a2dd1219536f7990ce4801dbeba 100755 (executable)
--- a/common/tct-sound-tizen-tests/inst.wgt.py
+++ b/common/tct-sound-tizen-tests/inst.wgt.py
@@ -1,242 +1,242 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sound-tizen-tests/inst.xpk.py b/common/tct-sound-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-sound-tizen-tests/inst.xpk.py
+++ b/common/tct-sound-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sound-tizen-tests/pack.py b/common/tct-sound-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-sound-tizen-tests/pack.py
+++ b/common/tct-sound-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-speech-w3c-tests/inst.apk.py b/common/tct-speech-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-speech-w3c-tests/inst.apk.py
+++ b/common/tct-speech-w3c-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-speech-w3c-tests/inst.wgt.py b/common/tct-speech-w3c-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/common/tct-speech-w3c-tests/inst.wgt.py
+++ b/common/tct-speech-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-speech-w3c-tests/inst.xpk.py b/common/tct-speech-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/common/tct-speech-w3c-tests/inst.xpk.py
+++ b/common/tct-speech-w3c-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-speech-w3c-tests/pack.py b/common/tct-speech-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-speech-w3c-tests/pack.py
+++ b/common/tct-speech-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-sse-w3c-tests/inst.apk.py b/common/tct-sse-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-sse-w3c-tests/inst.apk.py
+++ b/common/tct-sse-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sse-w3c-tests/inst.wgt.py b/common/tct-sse-w3c-tests/inst.wgt.py
index f0b99779f7728176a19e890891aa33136527334d..9386137732cb74814ebb2b5ed494f7dbbe6223ca 100755 (executable)
--- a/common/tct-sse-w3c-tests/inst.wgt.py
+++ b/common/tct-sse-w3c-tests/inst.wgt.py
@@ -1,242 +1,242 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-    for item in glob.glob("%s/sse/support/cgi/*" % SCRIPT_DIR):
-        item_name = os.path.basename(item)
-        if not doRemoteCopy(item, "%s/sse/support/%s" % (PKG_SRC_DIR, item_name)):
-            action_status = False
-    for item in glob.glob("%s/sse/w3c/resources/cgi/*" % SCRIPT_DIR):
-        item_name = os.path.basename(item)
-        if not doRemoteCopy(item, "%s/sse/w3c/resources/%s" % (PKG_SRC_DIR, item_name)):
-            action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+    for item in glob.glob("%s/sse/support/cgi/*" % SCRIPT_DIR):\r
+        item_name = os.path.basename(item)\r
+        if not doRemoteCopy(item, "%s/sse/support/%s" % (PKG_SRC_DIR, item_name)):\r
+            action_status = False\r
+    for item in glob.glob("%s/sse/w3c/resources/cgi/*" % SCRIPT_DIR):\r
+        item_name = os.path.basename(item)\r
+        if not doRemoteCopy(item, "%s/sse/w3c/resources/%s" % (PKG_SRC_DIR, item_name)):\r
+            action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sse-w3c-tests/inst.xpk.py b/common/tct-sse-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-sse-w3c-tests/inst.xpk.py
+++ b/common/tct-sse-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-sse-w3c-tests/pack.py b/common/tct-sse-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-sse-w3c-tests/pack.py
+++ b/common/tct-sse-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-svg-html5-tests/inst.apk.py b/common/tct-svg-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-svg-html5-tests/inst.apk.py
+++ b/common/tct-svg-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-svg-html5-tests/inst.wgt.py b/common/tct-svg-html5-tests/inst.wgt.py
index 5b1718da169ebc796a16962b47a209f160af24d9..ab3c36308524d2a6f3e12e14349eae47b7f1154c 100755 (executable)
--- a/common/tct-svg-html5-tests/inst.wgt.py
+++ b/common/tct-svg-html5-tests/inst.wgt.py
@@ -1,230 +1,230 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-svg-html5-tests/inst.xpk.py b/common/tct-svg-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-svg-html5-tests/inst.xpk.py
+++ b/common/tct-svg-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-svg-html5-tests/pack.py b/common/tct-svg-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-svg-html5-tests/pack.py
+++ b/common/tct-svg-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-systeminfo-tizen-tests/inst.apk.py b/common/tct-systeminfo-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/inst.apk.py
+++ b/common/tct-systeminfo-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-systeminfo-tizen-tests/inst.wgt.py b/common/tct-systeminfo-tizen-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..670f31e952fb5e42f1a9ba0b077946f5c8a3fa7e 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/inst.wgt.py
+++ b/common/tct-systeminfo-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -32,14 +32,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -190,8 +190,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -210,7 +210,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -222,10 +222,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-systeminfo-tizen-tests/inst.xpk.py b/common/tct-systeminfo-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/inst.xpk.py
+++ b/common/tct-systeminfo-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-systeminfo-tizen-tests/pack.py b/common/tct-systeminfo-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-systeminfo-tizen-tests/pack.py
+++ b/common/tct-systeminfo-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-systemsetting-tizen-tests/inst.apk.py b/common/tct-systemsetting-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-systemsetting-tizen-tests/inst.apk.py
+++ b/common/tct-systemsetting-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-systemsetting-tizen-tests/inst.wgt.py b/common/tct-systemsetting-tizen-tests/inst.wgt.py
index f09fdf912e360a2274228ab820d19f5db567f141..0089f81b258d0405ccce70fc47bf841aea868b9f 100755 (executable)
--- a/common/tct-systemsetting-tizen-tests/inst.wgt.py
+++ b/common/tct-systemsetting-tizen-tests/inst.wgt.py
@@ -1,238 +1,238 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/%s" % (SRC_DIR, PKG_NAME)):
-        action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    (return_code, output) = doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, PKG_NAME))\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    if not doRemoteCopy(os.path.join(SCRIPT_DIR, "mediasrc"), "%s/%s" % (SRC_DIR, PKG_NAME)):\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-systemsetting-tizen-tests/inst.xpk.py b/common/tct-systemsetting-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-systemsetting-tizen-tests/inst.xpk.py
+++ b/common/tct-systemsetting-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-systemsetting-tizen-tests/pack.py b/common/tct-systemsetting-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-systemsetting-tizen-tests/pack.py
+++ b/common/tct-systemsetting-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-template-w3c-tests/inst.apk.py b/common/tct-template-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-template-w3c-tests/inst.apk.py
+++ b/common/tct-template-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-template-w3c-tests/inst.wgt.py b/common/tct-template-w3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-template-w3c-tests/inst.wgt.py
+++ b/common/tct-template-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-template-w3c-tests/inst.xpk.py b/common/tct-template-w3c-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-template-w3c-tests/inst.xpk.py
+++ b/common/tct-template-w3c-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-template-w3c-tests/pack.py b/common/tct-template-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-template-w3c-tests/pack.py
+++ b/common/tct-template-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-text-css3-tests/inst.apk.py b/common/tct-text-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-text-css3-tests/inst.apk.py
+++ b/common/tct-text-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-text-css3-tests/inst.wgt.py b/common/tct-text-css3-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-text-css3-tests/inst.wgt.py
+++ b/common/tct-text-css3-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-text-css3-tests/inst.xpk.py b/common/tct-text-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-text-css3-tests/inst.xpk.py
+++ b/common/tct-text-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-text-css3-tests/pack.py b/common/tct-text-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-text-css3-tests/pack.py
+++ b/common/tct-text-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-time-tizen-tests/inst.apk.py b/common/tct-time-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-time-tizen-tests/inst.apk.py
+++ b/common/tct-time-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-time-tizen-tests/inst.wgt.py b/common/tct-time-tizen-tests/inst.wgt.py
index 44e57cf176811a997dd4abf590ad6d6c821d1835..5322534da626685908b341990530d3d06976154b 100755 (executable)
--- a/common/tct-time-tizen-tests/inst.wgt.py
+++ b/common/tct-time-tizen-tests/inst.wgt.py
@@ -1,241 +1,241 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+        \r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-time-tizen-tests/inst.xpk.py b/common/tct-time-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-time-tizen-tests/inst.xpk.py
+++ b/common/tct-time-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-time-tizen-tests/pack.py b/common/tct-time-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-time-tizen-tests/pack.py
+++ b/common/tct-time-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tizen-tizen-tests/inst.apk.py b/common/tct-tizen-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tizen-tizen-tests/inst.apk.py
+++ b/common/tct-tizen-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tizen-tizen-tests/inst.wgt.py b/common/tct-tizen-tizen-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-tizen-tizen-tests/inst.wgt.py
+++ b/common/tct-tizen-tizen-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tizen-tizen-tests/inst.xpk.py b/common/tct-tizen-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-tizen-tizen-tests/inst.xpk.py
+++ b/common/tct-tizen-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tizen-tizen-tests/pack.py b/common/tct-tizen-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tizen-tizen-tests/pack.py
+++ b/common/tct-tizen-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-touchevent-w3c-tests/inst.apk.py b/common/tct-touchevent-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-touchevent-w3c-tests/inst.apk.py
+++ b/common/tct-touchevent-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-touchevent-w3c-tests/inst.wgt.py b/common/tct-touchevent-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-touchevent-w3c-tests/inst.wgt.py
+++ b/common/tct-touchevent-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-touchevent-w3c-tests/inst.xpk.py b/common/tct-touchevent-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-touchevent-w3c-tests/inst.xpk.py
+++ b/common/tct-touchevent-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-touchevent-w3c-tests/pack.py b/common/tct-touchevent-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-touchevent-w3c-tests/pack.py
+++ b/common/tct-touchevent-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-transitions-css3-tests/inst.apk.py b/common/tct-transitions-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-transitions-css3-tests/inst.apk.py
+++ b/common/tct-transitions-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-transitions-css3-tests/inst.wgt.py b/common/tct-transitions-css3-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-transitions-css3-tests/inst.wgt.py
+++ b/common/tct-transitions-css3-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-transitions-css3-tests/inst.xpk.py b/common/tct-transitions-css3-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-transitions-css3-tests/inst.xpk.py
+++ b/common/tct-transitions-css3-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-transitions-css3-tests/pack.py b/common/tct-transitions-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-transitions-css3-tests/pack.py
+++ b/common/tct-transitions-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tv-audiocontrol-tizen-tests/inst.apk.py b/common/tct-tv-audiocontrol-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tv-audiocontrol-tizen-tests/inst.apk.py
+++ b/common/tct-tv-audiocontrol-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-audiocontrol-tizen-tests/inst.wgt.py b/common/tct-tv-audiocontrol-tizen-tests/inst.wgt.py
index 54b678a516403cca3f8b6f349d1cedbbf38f2410..54f3b9117daae6814c910a4afc00f2d3c2529624 100755 (executable)
--- a/common/tct-tv-audiocontrol-tizen-tests/inst.wgt.py
+++ b/common/tct-tv-audiocontrol-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-tv-audiocontrol-tizen-tests/inst.xpk.py b/common/tct-tv-audiocontrol-tizen-tests/inst.xpk.py
index 1835f7b9996ab516082815d0174785eece0ad4fc..9daf93e5bb08770127c9f4151afa5364efca20aa 100755 (executable)
--- a/common/tct-tv-audiocontrol-tizen-tests/inst.xpk.py
+++ b/common/tct-tv-audiocontrol-tizen-tests/inst.xpk.py
@@ -1,226 +1,226 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-audiocontrol-tizen-tests/pack.py b/common/tct-tv-audiocontrol-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tv-audiocontrol-tizen-tests/pack.py
+++ b/common/tct-tv-audiocontrol-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tv-channel-tizen-tests/inst.apk.py b/common/tct-tv-channel-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tv-channel-tizen-tests/inst.apk.py
+++ b/common/tct-tv-channel-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-channel-tizen-tests/inst.wgt.py b/common/tct-tv-channel-tizen-tests/inst.wgt.py
index 145211488f64c080a91702f338bce3033501800f..36be2eb51f034efa9ca66695224cea7fbc508bea 100755 (executable)
--- a/common/tct-tv-channel-tizen-tests/inst.wgt.py
+++ b/common/tct-tv-channel-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-tv-channel-tizen-tests/inst.xpk.py b/common/tct-tv-channel-tizen-tests/inst.xpk.py
index a5295f0ab0fd7b9e820168dabc4ca3e1caee5b9c..a61db816d77ae07424a408a39610359b9337006b 100755 (executable)
--- a/common/tct-tv-channel-tizen-tests/inst.xpk.py
+++ b/common/tct-tv-channel-tizen-tests/inst.xpk.py
@@ -1,228 +1,228 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-channel-tizen-tests/pack.py b/common/tct-tv-channel-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tv-channel-tizen-tests/pack.py
+++ b/common/tct-tv-channel-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tv-displaycontrol-tizen-tests/inst.apk.py b/common/tct-tv-displaycontrol-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tv-displaycontrol-tizen-tests/inst.apk.py
+++ b/common/tct-tv-displaycontrol-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-displaycontrol-tizen-tests/inst.wgt.py b/common/tct-tv-displaycontrol-tizen-tests/inst.wgt.py
index 145211488f64c080a91702f338bce3033501800f..36be2eb51f034efa9ca66695224cea7fbc508bea 100755 (executable)
--- a/common/tct-tv-displaycontrol-tizen-tests/inst.wgt.py
+++ b/common/tct-tv-displaycontrol-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-tv-displaycontrol-tizen-tests/inst.xpk.py b/common/tct-tv-displaycontrol-tizen-tests/inst.xpk.py
index d9ea2dfa9e744d7f14affdb1a4613b2f669357a7..8d40c52c3024bb44f8530d6902b9113dcb251a9e 100755 (executable)
--- a/common/tct-tv-displaycontrol-tizen-tests/inst.xpk.py
+++ b/common/tct-tv-displaycontrol-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = ""
-PKG_SRC_DIR = ""
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-
-    global SRC_DIR, PKG_SRC_DIR
-    SRC_DIR = "/home/%s/content" % PARAMETERS.user
-    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = ""\r
+PKG_SRC_DIR = ""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+\r
+    global SRC_DIR, PKG_SRC_DIR\r
+    SRC_DIR = "/home/%s/content" % PARAMETERS.user\r
+    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-displaycontrol-tizen-tests/pack.py b/common/tct-tv-displaycontrol-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tv-displaycontrol-tizen-tests/pack.py
+++ b/common/tct-tv-displaycontrol-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tv-info-tizen-tests/inst.apk.py b/common/tct-tv-info-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tv-info-tizen-tests/inst.apk.py
+++ b/common/tct-tv-info-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-info-tizen-tests/inst.wgt.py b/common/tct-tv-info-tizen-tests/inst.wgt.py
index a4eb99140077f64e24452c4e384f641db7050791..bb8ad4b67cadff90c71ae923fe713a3466b8182a 100755 (executable)
--- a/common/tct-tv-info-tizen-tests/inst.wgt.py
+++ b/common/tct-tv-info-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -32,14 +32,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -185,8 +185,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -205,7 +205,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -217,10 +217,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-tv-info-tizen-tests/inst.xpk.py b/common/tct-tv-info-tizen-tests/inst.xpk.py
index d9ea2dfa9e744d7f14affdb1a4613b2f669357a7..8d40c52c3024bb44f8530d6902b9113dcb251a9e 100755 (executable)
--- a/common/tct-tv-info-tizen-tests/inst.xpk.py
+++ b/common/tct-tv-info-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = ""
-PKG_SRC_DIR = ""
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-
-    global SRC_DIR, PKG_SRC_DIR
-    SRC_DIR = "/home/%s/content" % PARAMETERS.user
-    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = ""\r
+PKG_SRC_DIR = ""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+\r
+    global SRC_DIR, PKG_SRC_DIR\r
+    SRC_DIR = "/home/%s/content" % PARAMETERS.user\r
+    PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-info-tizen-tests/pack.py b/common/tct-tv-info-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tv-info-tizen-tests/pack.py
+++ b/common/tct-tv-info-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-tv-window-tizen-tests/inst.apk.py b/common/tct-tv-window-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-tv-window-tizen-tests/inst.apk.py
+++ b/common/tct-tv-window-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-window-tizen-tests/inst.wgt.py b/common/tct-tv-window-tizen-tests/inst.wgt.py
index 2c16cb57be8f28c6c58319de52d6bd76bb9a875e..d4f6ce479557997082e5fbfa6d2efd3647add616 100755 (executable)
--- a/common/tct-tv-window-tizen-tests/inst.wgt.py
+++ b/common/tct-tv-window-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -186,8 +186,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -206,7 +206,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -218,10 +218,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-tv-window-tizen-tests/inst.xpk.py b/common/tct-tv-window-tizen-tests/inst.xpk.py
index 1835f7b9996ab516082815d0174785eece0ad4fc..9daf93e5bb08770127c9f4151afa5364efca20aa 100755 (executable)
--- a/common/tct-tv-window-tizen-tests/inst.xpk.py
+++ b/common/tct-tv-window-tizen-tests/inst.xpk.py
@@ -1,226 +1,226 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-SRC_DIR = "/home/app/content"
-PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "app"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+SRC_DIR = "/home/app/content"\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "app"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-tv-window-tizen-tests/pack.py b/common/tct-tv-window-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-tv-window-tizen-tests/pack.py
+++ b/common/tct-tv-window-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-typedarrays-nonw3c-tests/inst.apk.py b/common/tct-typedarrays-nonw3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-typedarrays-nonw3c-tests/inst.apk.py
+++ b/common/tct-typedarrays-nonw3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-typedarrays-nonw3c-tests/inst.wgt.py b/common/tct-typedarrays-nonw3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-typedarrays-nonw3c-tests/inst.wgt.py
+++ b/common/tct-typedarrays-nonw3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-typedarrays-nonw3c-tests/inst.xpk.py b/common/tct-typedarrays-nonw3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-typedarrays-nonw3c-tests/inst.xpk.py
+++ b/common/tct-typedarrays-nonw3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-typedarrays-nonw3c-tests/pack.py b/common/tct-typedarrays-nonw3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-typedarrays-nonw3c-tests/pack.py
+++ b/common/tct-typedarrays-nonw3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-ui-css3-tests/inst.apk.py b/common/tct-ui-css3-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-ui-css3-tests/inst.apk.py
+++ b/common/tct-ui-css3-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ui-css3-tests/inst.wgt.py b/common/tct-ui-css3-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-ui-css3-tests/inst.wgt.py
+++ b/common/tct-ui-css3-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ui-css3-tests/inst.xpk.py b/common/tct-ui-css3-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-ui-css3-tests/inst.xpk.py
+++ b/common/tct-ui-css3-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-ui-css3-tests/pack.py b/common/tct-ui-css3-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-ui-css3-tests/pack.py
+++ b/common/tct-ui-css3-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-vibration-w3c-tests/inst.apk.py b/common/tct-vibration-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-vibration-w3c-tests/inst.apk.py
+++ b/common/tct-vibration-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-vibration-w3c-tests/inst.wgt.py b/common/tct-vibration-w3c-tests/inst.wgt.py
index 8ed577c13fa1502efd2413b1f191aae30c227262..21f138a35ebe698176774458d61e85c165ac281a 100755 (executable)
--- a/common/tct-vibration-w3c-tests/inst.wgt.py
+++ b/common/tct-vibration-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-vibration-w3c-tests/inst.xpk.py b/common/tct-vibration-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-vibration-w3c-tests/inst.xpk.py
+++ b/common/tct-vibration-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-vibration-w3c-tests/pack.py b/common/tct-vibration-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-vibration-w3c-tests/pack.py
+++ b/common/tct-vibration-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-video-html5-tests/inst.apk.py b/common/tct-video-html5-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-video-html5-tests/inst.apk.py
+++ b/common/tct-video-html5-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-video-html5-tests/inst.wgt.py b/common/tct-video-html5-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-video-html5-tests/inst.wgt.py
+++ b/common/tct-video-html5-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-video-html5-tests/inst.xpk.py b/common/tct-video-html5-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-video-html5-tests/inst.xpk.py
+++ b/common/tct-video-html5-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-video-html5-tests/pack.py b/common/tct-video-html5-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-video-html5-tests/pack.py
+++ b/common/tct-video-html5-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-voicecontrol-tizen-tests/inst.apk.py b/common/tct-voicecontrol-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-voicecontrol-tizen-tests/inst.apk.py
+++ b/common/tct-voicecontrol-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-voicecontrol-tizen-tests/inst.wgt.py b/common/tct-voicecontrol-tizen-tests/inst.wgt.py
index 257e5c264368ad3bc127ce6e6fe6b39b4b3b7e8e..bac23c006f419589d50787b114cf4fddab470fd1 100755 (executable)
--- a/common/tct-voicecontrol-tizen-tests/inst.wgt.py
+++ b/common/tct-voicecontrol-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -182,8 +182,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -202,7 +202,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -214,10 +214,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-voicecontrol-tizen-tests/inst.xpk.py b/common/tct-voicecontrol-tizen-tests/inst.xpk.py
index c0c358eccbe00400cf69651e2937542462b771d2..34a9d92c36c7de32dda454d634bc849fdea0cc0d 100755 (executable)
--- a/common/tct-voicecontrol-tizen-tests/inst.xpk.py
+++ b/common/tct-voicecontrol-tizen-tests/inst.xpk.py
@@ -1,214 +1,214 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-voicecontrol-tizen-tests/pack.py b/common/tct-voicecontrol-tizen-tests/pack.py
index 08d55aafea37b74455bc394308459ede3844bb7c..92866ab2ed6acacf72d8704056c4c25f4835332a 100755 (executable)
--- a/common/tct-voicecontrol-tizen-tests/pack.py
+++ b/common/tct-voicecontrol-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-webaudio-w3c-tests/inst.apk.py b/common/tct-webaudio-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-webaudio-w3c-tests/inst.apk.py
+++ b/common/tct-webaudio-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webaudio-w3c-tests/inst.wgt.py b/common/tct-webaudio-w3c-tests/inst.wgt.py
index 93ac8ad714963bd2c8c224982d78ae0ac055b042..66eb23daabeb2161c3546c02b25a73e343ce979d 100755 (executable)
--- a/common/tct-webaudio-w3c-tests/inst.wgt.py
+++ b/common/tct-webaudio-w3c-tests/inst.wgt.py
@@ -1,240 +1,240 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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 %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:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webaudio-w3c-tests/inst.xpk.py b/common/tct-webaudio-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-webaudio-w3c-tests/inst.xpk.py
+++ b/common/tct-webaudio-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webaudio-w3c-tests/pack.py b/common/tct-webaudio-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-webaudio-w3c-tests/pack.py
+++ b/common/tct-webaudio-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-webgl-nonw3c-tests/inst.apk.py b/common/tct-webgl-nonw3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/common/tct-webgl-nonw3c-tests/inst.apk.py
+++ b/common/tct-webgl-nonw3c-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webgl-nonw3c-tests/inst.wgt.py b/common/tct-webgl-nonw3c-tests/inst.wgt.py
index dd614f26548aab1c49ce4a34e3e02b05ef5e4971..b30f310f466b83085a7761c6cf6c03fa851ab479 100755 (executable)
--- a/common/tct-webgl-nonw3c-tests/inst.wgt.py
+++ b/common/tct-webgl-nonw3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -215,10 +215,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webgl-nonw3c-tests/inst.xpk.py b/common/tct-webgl-nonw3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/common/tct-webgl-nonw3c-tests/inst.xpk.py
+++ b/common/tct-webgl-nonw3c-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webgl-nonw3c-tests/pack.py b/common/tct-webgl-nonw3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-webgl-nonw3c-tests/pack.py
+++ b/common/tct-webgl-nonw3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-webmessaging-w3c-tests/inst.apk.py b/common/tct-webmessaging-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-webmessaging-w3c-tests/inst.apk.py
+++ b/common/tct-webmessaging-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webmessaging-w3c-tests/inst.wgt.py b/common/tct-webmessaging-w3c-tests/inst.wgt.py
index 46b3b4aa303312c354d008b28b7fe78dd8e5e6af..44c1b3fec79537bc7a65ce22af0d9b3fc7055ee6 100755 (executable)
--- a/common/tct-webmessaging-w3c-tests/inst.wgt.py
+++ b/common/tct-webmessaging-w3c-tests/inst.wgt.py
@@ -1,234 +1,234 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webmessaging-w3c-tests/inst.xpk.py b/common/tct-webmessaging-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-webmessaging-w3c-tests/inst.xpk.py
+++ b/common/tct-webmessaging-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webmessaging-w3c-tests/pack.py b/common/tct-webmessaging-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-webmessaging-w3c-tests/pack.py
+++ b/common/tct-webmessaging-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-websetting-tizen-tests/inst.apk.py b/common/tct-websetting-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-websetting-tizen-tests/inst.apk.py
+++ b/common/tct-websetting-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-websetting-tizen-tests/inst.wgt.py b/common/tct-websetting-tizen-tests/inst.wgt.py
index 5b1718da169ebc796a16962b47a209f160af24d9..ab3c36308524d2a6f3e12e14349eae47b7f1154c 100755 (executable)
--- a/common/tct-websetting-tizen-tests/inst.wgt.py
+++ b/common/tct-websetting-tizen-tests/inst.wgt.py
@@ -1,230 +1,230 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t wgt -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t wgt -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-websetting-tizen-tests/inst.xpk.py b/common/tct-websetting-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-websetting-tizen-tests/inst.xpk.py
+++ b/common/tct-websetting-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-websetting-tizen-tests/pack.py b/common/tct-websetting-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-websetting-tizen-tests/pack.py
+++ b/common/tct-websetting-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-websocket-w3c-tests/inst.apk.py b/common/tct-websocket-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-websocket-w3c-tests/inst.apk.py
+++ b/common/tct-websocket-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-websocket-w3c-tests/inst.wgt.py b/common/tct-websocket-w3c-tests/inst.wgt.py
index 9c17c1ad72abe8efd6676db89600e7198bd680af..d442317ad901dd9c07ded27b4de2ff2d47dcba45 100755 (executable)
--- a/common/tct-websocket-w3c-tests/inst.wgt.py
+++ b/common/tct-websocket-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -185,8 +185,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -205,7 +205,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -217,10 +217,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-websocket-w3c-tests/inst.xpk.py b/common/tct-websocket-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-websocket-w3c-tests/inst.xpk.py
+++ b/common/tct-websocket-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-websocket-w3c-tests/pack.py b/common/tct-websocket-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-websocket-w3c-tests/pack.py
+++ b/common/tct-websocket-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-webstorage-w3c-tests/inst.apk.py b/common/tct-webstorage-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-webstorage-w3c-tests/inst.apk.py
+++ b/common/tct-webstorage-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webstorage-w3c-tests/inst.wgt.py b/common/tct-webstorage-w3c-tests/inst.wgt.py
index c7f89fd44607b570bbcae5447b935557cf8e590b..909755af3b4e03918ae3823bc036ddf994a43999 100755 (executable)
--- a/common/tct-webstorage-w3c-tests/inst.wgt.py
+++ b/common/tct-webstorage-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -191,8 +191,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +211,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -223,10 +223,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webstorage-w3c-tests/inst.xpk.py b/common/tct-webstorage-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-webstorage-w3c-tests/inst.xpk.py
+++ b/common/tct-webstorage-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-webstorage-w3c-tests/pack.py b/common/tct-webstorage-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-webstorage-w3c-tests/pack.py
+++ b/common/tct-webstorage-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-webwidget-w3c-tests/inst.apk.py b/common/tct-webwidget-w3c-tests/inst.apk.py
index d5f9fbb96f7b82ebce4068b79598df34023b9b0f..d636bee034d8504fbfee33e3d6fe297f4e9bee1a 100755 (executable)
--- a/common/tct-webwidget-w3c-tests/inst.apk.py
+++ b/common/tct-webwidget-w3c-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webwidget-w3c-tests/inst.wgt.py b/common/tct-webwidget-w3c-tests/inst.wgt.py
index 31bd49daf1cf07d1034d4ddecdae69a9e93129bf..1c685e3578706576a0adeb5b84b7c9326188d06e 100755 (executable)
--- a/common/tct-webwidget-w3c-tests/inst.wgt.py
+++ b/common/tct-webwidget-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -195,8 +195,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -215,7 +215,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -227,10 +227,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webwidget-w3c-tests/inst.xpk.py b/common/tct-webwidget-w3c-tests/inst.xpk.py
index f70351a9bca5ce6c87032da6adacd41a268563bc..ace8cbba96610eaf7e44d169716ce4fc3b921873 100755 (executable)
--- a/common/tct-webwidget-w3c-tests/inst.xpk.py
+++ b/common/tct-webwidget-w3c-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-webwidget-w3c-tests/pack.py b/common/tct-webwidget-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-webwidget-w3c-tests/pack.py
+++ b/common/tct-webwidget-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-wgtapi01-w3c-tests/inst.apk.py b/common/tct-wgtapi01-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-wgtapi01-w3c-tests/inst.apk.py
+++ b/common/tct-wgtapi01-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-wgtapi01-w3c-tests/inst.wgt.py b/common/tct-wgtapi01-w3c-tests/inst.wgt.py
index 9dff63be5ebff1fac5be559af7263d6d0851a2b1..302423c2a5aa058efa040568a45461c17ffeeb56 100755 (executable)
--- a/common/tct-wgtapi01-w3c-tests/inst.wgt.py
+++ b/common/tct-wgtapi01-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -187,8 +187,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -207,7 +207,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -219,10 +219,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-wgtapi01-w3c-tests/inst.xpk.py b/common/tct-wgtapi01-w3c-tests/inst.xpk.py
index 453aef60bd50a565d5f607281cdfbef751e725f0..0f490f94cf4e9e1dbbf046a15f4af8e9b2a917e5 100755 (executable)
--- a/common/tct-wgtapi01-w3c-tests/inst.xpk.py
+++ b/common/tct-wgtapi01-w3c-tests/inst.xpk.py
@@ -1,222 +1,222 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(PKG_NAME + ".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(PKG_NAME + ".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-wgtapi01-w3c-tests/pack.py b/common/tct-wgtapi01-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-wgtapi01-w3c-tests/pack.py
+++ b/common/tct-wgtapi01-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-wgtapi02-w3c-tests/inst.apk.py b/common/tct-wgtapi02-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-wgtapi02-w3c-tests/inst.apk.py
+++ b/common/tct-wgtapi02-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-wgtapi02-w3c-tests/inst.wgt.py b/common/tct-wgtapi02-w3c-tests/inst.wgt.py
index 145211488f64c080a91702f338bce3033501800f..36be2eb51f034efa9ca66695224cea7fbc508bea 100755 (executable)
--- a/common/tct-wgtapi02-w3c-tests/inst.wgt.py
+++ b/common/tct-wgtapi02-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-wgtapi02-w3c-tests/inst.xpk.py b/common/tct-wgtapi02-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-wgtapi02-w3c-tests/inst.xpk.py
+++ b/common/tct-wgtapi02-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-wgtapi02-w3c-tests/pack.py b/common/tct-wgtapi02-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-wgtapi02-w3c-tests/pack.py
+++ b/common/tct-wgtapi02-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-widget01-w3c-tests/inst.apk.py b/common/tct-widget01-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-widget01-w3c-tests/inst.apk.py
+++ b/common/tct-widget01-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widget01-w3c-tests/inst.wgt.py b/common/tct-widget01-w3c-tests/inst.wgt.py
index 9dff63be5ebff1fac5be559af7263d6d0851a2b1..302423c2a5aa058efa040568a45461c17ffeeb56 100755 (executable)
--- a/common/tct-widget01-w3c-tests/inst.wgt.py
+++ b/common/tct-widget01-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -187,8 +187,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -207,7 +207,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -219,10 +219,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widget01-w3c-tests/inst.xpk.py b/common/tct-widget01-w3c-tests/inst.xpk.py
index 453aef60bd50a565d5f607281cdfbef751e725f0..0f490f94cf4e9e1dbbf046a15f4af8e9b2a917e5 100755 (executable)
--- a/common/tct-widget01-w3c-tests/inst.xpk.py
+++ b/common/tct-widget01-w3c-tests/inst.xpk.py
@@ -1,222 +1,222 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(PKG_NAME + ".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(PKG_NAME + ".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widget01-w3c-tests/pack.py b/common/tct-widget01-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-widget01-w3c-tests/pack.py
+++ b/common/tct-widget01-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-widget02-w3c-tests/inst.apk.py b/common/tct-widget02-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-widget02-w3c-tests/inst.apk.py
+++ b/common/tct-widget02-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widget02-w3c-tests/inst.wgt.py b/common/tct-widget02-w3c-tests/inst.wgt.py
index 31bd49daf1cf07d1034d4ddecdae69a9e93129bf..1c685e3578706576a0adeb5b84b7c9326188d06e 100755 (executable)
--- a/common/tct-widget02-w3c-tests/inst.wgt.py
+++ b/common/tct-widget02-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -195,8 +195,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -215,7 +215,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -227,10 +227,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widget02-w3c-tests/inst.xpk.py b/common/tct-widget02-w3c-tests/inst.xpk.py
index aa292c3795e83842b3a33fef0f81bac408e3b979..7dcd40d98397cd17a140502f944e8da844a80081 100755 (executable)
--- a/common/tct-widget02-w3c-tests/inst.xpk.py
+++ b/common/tct-widget02-w3c-tests/inst.xpk.py
@@ -1,229 +1,229 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-#                    action_status = False
-#                (return_code, output) = doRemoteCMD(
-#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-#                for line in output:
-#                    if "Failure" in line:
-#                        action_status = False
-#                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+#        for file in files:\r
+#            if file.endswith(".xpk"):\r
+#                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+#                    action_status = False\r
+#                (return_code, output) = doRemoteCMD(\r
+#                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+#                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+#                for line in output:\r
+#                    if "Failure" in line:\r
+#                        action_status = False\r
+#                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widget02-w3c-tests/pack.py b/common/tct-widget02-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-widget02-w3c-tests/pack.py
+++ b/common/tct-widget02-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-widgetpolicy-w3c-tests/inst.apk.py b/common/tct-widgetpolicy-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-widgetpolicy-w3c-tests/inst.apk.py
+++ b/common/tct-widgetpolicy-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widgetpolicy-w3c-tests/inst.wgt.py b/common/tct-widgetpolicy-w3c-tests/inst.wgt.py
index 6d00172cdbcff1093f2c9f2469e8b346bf1c4a71..138a08bfec319c6a5d5a7b2df65cd16f8e26d5c3 100755 (executable)
--- a/common/tct-widgetpolicy-w3c-tests/inst.wgt.py
+++ b/common/tct-widgetpolicy-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widgetpolicy-w3c-tests/inst.xpk.py b/common/tct-widgetpolicy-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-widgetpolicy-w3c-tests/inst.xpk.py
+++ b/common/tct-widgetpolicy-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-widgetpolicy-w3c-tests/pack.py b/common/tct-widgetpolicy-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-widgetpolicy-w3c-tests/pack.py
+++ b/common/tct-widgetpolicy-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-widgetservice-tizen-tests/inst.apk.py b/common/tct-widgetservice-tizen-tests/inst.apk.py
index d5f9fbb96f7b82ebce4068b79598df34023b9b0f..d636bee034d8504fbfee33e3d6fe297f4e9bee1a 100755 (executable)
--- a/common/tct-widgetservice-tizen-tests/inst.apk.py
+++ b/common/tct-widgetservice-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widgetservice-tizen-tests/inst.wgt.py b/common/tct-widgetservice-tizen-tests/inst.wgt.py
index 5e4c9171301b7c5b257d0c1fa5d98bf89659e08c..3bcf73639d0dfee35216b86bc89b730fd63d01fa 100755 (executable)
--- a/common/tct-widgetservice-tizen-tests/inst.wgt.py
+++ b/common/tct-widgetservice-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -32,14 +32,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -190,8 +190,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -210,7 +210,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -222,10 +222,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widgetservice-tizen-tests/inst.xpk.py b/common/tct-widgetservice-tizen-tests/inst.xpk.py
index f70351a9bca5ce6c87032da6adacd41a268563bc..ace8cbba96610eaf7e44d169716ce4fc3b921873 100755 (executable)
--- a/common/tct-widgetservice-tizen-tests/inst.xpk.py
+++ b/common/tct-widgetservice-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-widgetservice-tizen-tests/pack.py b/common/tct-widgetservice-tizen-tests/pack.py
index c20c9326d3ba4ab9cfb6192aa37d5e1bd4208ea4..d725d5685cf0da4f4cceec8dbafeeca89c27ebfc 100755 (executable)
--- a/common/tct-widgetservice-tizen-tests/pack.py
+++ b/common/tct-widgetservice-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -957,7 +957,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-woff-w3c-tests/inst.apk.py b/common/tct-woff-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-woff-w3c-tests/inst.apk.py
+++ b/common/tct-woff-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-woff-w3c-tests/inst.wgt.py b/common/tct-woff-w3c-tests/inst.wgt.py
index d7b962bfa82776fca71e2303a49cf948e5f9ffac..0f5e3baa11e24ff29fb940d13879654eed5d1ac5 100755 (executable)
--- a/common/tct-woff-w3c-tests/inst.wgt.py
+++ b/common/tct-woff-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -189,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -209,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -221,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-woff-w3c-tests/inst.xpk.py b/common/tct-woff-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-woff-w3c-tests/inst.xpk.py
+++ b/common/tct-woff-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-woff-w3c-tests/pack.py b/common/tct-woff-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-woff-w3c-tests/pack.py
+++ b/common/tct-woff-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-workers-w3c-tests/inst.apk.py b/common/tct-workers-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-workers-w3c-tests/inst.apk.py
+++ b/common/tct-workers-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-workers-w3c-tests/inst.wgt.py b/common/tct-workers-w3c-tests/inst.wgt.py
index 225affe5a3ff4e0d27bbc3695f245a9a795c7df7..b50fcca5d1a9a39a06857b21701111ae84722674 100755 (executable)
--- a/common/tct-workers-w3c-tests/inst.wgt.py
+++ b/common/tct-workers-w3c-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -29,18 +29,18 @@ def userCheck():
         GLOVAL_OPT="--global"
     else:
         GLOVAL_OPT=""
-        
+
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -64,8 +64,6 @@ def getUSERID():
     return doCMD(cmd)
 
 
-
-
 def getPKGID(pkg_name=None):
     if PARAMETERS.mode == "SDB":
         cmd = "sdb -s %s shell %s" % (
@@ -191,8 +189,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -211,7 +209,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -223,10 +221,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/common/tct-workers-w3c-tests/inst.xpk.py b/common/tct-workers-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-workers-w3c-tests/inst.xpk.py
+++ b/common/tct-workers-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-workers-w3c-tests/pack.py b/common/tct-workers-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-workers-w3c-tests/pack.py
+++ b/common/tct-workers-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/common/tct-xmlhttprequest-w3c-tests/inst.apk.py b/common/tct-xmlhttprequest-w3c-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/common/tct-xmlhttprequest-w3c-tests/inst.apk.py
+++ b/common/tct-xmlhttprequest-w3c-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-xmlhttprequest-w3c-tests/inst.wgt.py b/common/tct-xmlhttprequest-w3c-tests/inst.wgt.py
index 88104a59d3c1f1a6128534f609c1f0af93269824..432dcbb17005766de25ebdba6484221a077c1609 100755 (executable)
--- a/common/tct-xmlhttprequest-w3c-tests/inst.wgt.py
+++ b/common/tct-xmlhttprequest-w3c-tests/inst.wgt.py
@@ -1,239 +1,238 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-def uninstPKGs():
-    action_status = True
-    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]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        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 %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:
-                        action_status = False
-                        break
-
-    for item in glob.glob("%s/*" % SCRIPT_DIR):
-        if item.endswith(".wgt"):
-            continue
-        elif item.endswith("inst.py"):
-            continue
-        else:
-            item_name = os.path.basename(item)
-            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):
-            #if not doRemoteCopy(item, PKG_SRC_DIR):
-                action_status = False
-    for item in glob.glob("%s/xmlhttprequest/w3c/resources/cgi/*" % SCRIPT_DIR):
-        item_name = os.path.basename(item)
-        if not doRemoteCopy(item, "%s/xmlhttprequest/w3c/resources/%s" % (PKG_SRC_DIR, item_name)):
-        #if not doRemoteCopy(item, PKG_SRC_DIR):
-            action_status = False
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = EXECUTION_MODE_30
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    userCheck()
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+EXECUTION_MODE_30 = tct_parser.get('DEVICE', 'DEVICE_EXECUTION_MODE_30')\r
+ADMIN_USER_30 = tct_parser.get('DEVICE', 'DEVICE_ADMIN_USER_30')\r
+\r
+def userCheck():\r
+    global GLOVAL_OPT\r
+    if ADMIN_USER_30 == EXECUTION_MODE_30:\r
+        GLOVAL_OPT="--global"\r
+    else:\r
+        GLOVAL_OPT=""\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -u -t wgt -q -n %s" % (GLOVAL_OPT, pkg_id))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".wgt"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd %s -i -t wgt -q -p %s/%s" % (GLOVAL_OPT, SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    for item in glob.glob("%s/*" % SCRIPT_DIR):\r
+        if item.endswith(".wgt"):\r
+            continue\r
+        elif item.endswith("inst.py"):\r
+            continue\r
+        else:\r
+            item_name = os.path.basename(item)\r
+            if not doRemoteCopy(item, "%s/%s" % (PKG_SRC_DIR, item_name)):\r
+            #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+                action_status = False\r
+    for item in glob.glob("%s/xmlhttprequest/w3c/resources/cgi/*" % SCRIPT_DIR):\r
+        item_name = os.path.basename(item)\r
+        if not doRemoteCopy(item, "%s/xmlhttprequest/w3c/resources/%s" % (PKG_SRC_DIR, item_name)):\r
+        #if not doRemoteCopy(item, PKG_SRC_DIR):\r
+            action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = EXECUTION_MODE_30\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    userCheck()\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-xmlhttprequest-w3c-tests/inst.xpk.py b/common/tct-xmlhttprequest-w3c-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/common/tct-xmlhttprequest-w3c-tests/inst.xpk.py
+++ b/common/tct-xmlhttprequest-w3c-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/common/tct-xmlhttprequest-w3c-tests/pack.py b/common/tct-xmlhttprequest-w3c-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/common/tct-xmlhttprequest-w3c-tests/pack.py
+++ b/common/tct-xmlhttprequest-w3c-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/iot/tct-capability-tests/inst.apk.py b/iot/tct-capability-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/iot/tct-capability-tests/inst.apk.py
+++ b/iot/tct-capability-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/iot/tct-capability-tests/inst.wgt.py b/iot/tct-capability-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/iot/tct-capability-tests/inst.wgt.py
+++ b/iot/tct-capability-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/iot/tct-capability-tests/inst.xpk.py b/iot/tct-capability-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/iot/tct-capability-tests/inst.xpk.py
+++ b/iot/tct-capability-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/iot/tct-capability-tests/pack.py b/iot/tct-capability-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/iot/tct-capability-tests/pack.py
+++ b/iot/tct-capability-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/iot/tct-deprecatedapi-tizen-tests/inst.apk.py b/iot/tct-deprecatedapi-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d8019edc1cf0d125c41878f23e166ead5a3c699f 100755 (executable)
--- a/iot/tct-deprecatedapi-tizen-tests/inst.apk.py
+++ b/iot/tct-deprecatedapi-tizen-tests/inst.apk.py
@@ -1,108 +1,108 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PARAMETERS = None
-ADB_CMD = "adb"
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def uninstPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s uninstall org.xwalk.%s" % (
-                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    for root, dirs, files in os.walk(SCRIPT_DIR):
-        for file in files:
-            if file.endswith(".apk"):
-                cmd = "%s -s %s install %s" % (ADB_CMD,
-                                               PARAMETERS.device, os.path.join(root, file))
-                (return_code, output) = doCMD(cmd)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.device:
-        (return_code, output) = doCMD("adb devices")
-        for line in output:
-            if str.find(line, "\tdevice") != -1:
-                PARAMETERS.device = line.split("\t")[0]
-                break
-
-    if not PARAMETERS.device:
-        print "No device found"
-        sys.exit(1)
-
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PARAMETERS = None\r
+ADB_CMD = "adb"\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s uninstall org.xwalk.%s" % (\r
+                    ADB_CMD, PARAMETERS.device, os.path.basename(os.path.splitext(file)[0]))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        for file in files:\r
+            if file.endswith(".apk"):\r
+                cmd = "%s -s %s install %s" % (ADB_CMD,\r
+                                               PARAMETERS.device, os.path.join(root, file))\r
+                (return_code, output) = doCMD(cmd)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.device:\r
+        (return_code, output) = doCMD("adb devices")\r
+        for line in output:\r
+            if str.find(line, "\tdevice") != -1:\r
+                PARAMETERS.device = line.split("\t")[0]\r
+                break\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device found")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/iot/tct-deprecatedapi-tizen-tests/inst.wgt.py b/iot/tct-deprecatedapi-tizen-tests/inst.wgt.py
index e32732b340da4841aa7a480e4c2e53dbd8f4b635..8e0d9ef1ac5649b442f894d42aea36e60df8bd95 100755 (executable)
--- a/iot/tct-deprecatedapi-tizen-tests/inst.wgt.py
+++ b/iot/tct-deprecatedapi-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/iot/tct-deprecatedapi-tizen-tests/inst.xpk.py b/iot/tct-deprecatedapi-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..454919c67ddb6e1a63505419ba26a2d7a29b7497 100755 (executable)
--- a/iot/tct-deprecatedapi-tizen-tests/inst.xpk.py
+++ b/iot/tct-deprecatedapi-tizen-tests/inst.xpk.py
@@ -1,231 +1,231 @@
-#!/usr/bin/env python
-
-import os
-import shutil
-import glob
-import time
-import sys
-import subprocess
-import string
+#!/usr/bin/env python\r
+\r
+import os\r
+import shutil\r
+import glob\r
+import time\r
+import sys\r
+import subprocess\r
+import string\r
 from optparse import OptionParser, make_option\r
-import ConfigParser
-
-
-SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
-PKG_NAME = os.path.basename(SCRIPT_DIR)
-PARAMETERS = None
-#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
-TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-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)
-
-
-def doCMD(cmd):
-    # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
-    output = []
-    cmd_return_code = 1
-    cmd_proc = subprocess.Popen(
-        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-
-    while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
-        cmd_return_code = cmd_proc.poll()
-        if output_line == '' and cmd_return_code != None:
-            break
-        sys.stdout.write("%s\n" % output_line)
-        sys.stdout.flush()
-        output.append(output_line)
-
-    return (cmd_return_code, output)
-
-
-def updateCMD(cmd=None):
-    if "pkgcmd" in cmd:
-        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)
-    return cmd
-def getUSERID():
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell id -u %s" % (
-            PARAMETERS.device, PARAMETERS.user)
-    else:
-        cmd = "ssh %s \"id -u %s\"" % (
-            PARAMETERS.device, PARAMETERS.user )
-    return doCMD(cmd)
-
-
-
-
-def getPKGID(pkg_name=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-    else:
-        cmd = "ssh %s \"%s\"" % (
-            PARAMETERS.device, updateCMD('pkgcmd -l'))
-
-    (return_code, output) = doCMD(cmd)
-    if return_code != 0:
-        return None
-
-    test_pkg_id = None
-    for line in output:
-        if line.find("[" + pkg_name + "]") != -1:
-            pkgidIndex = line.split().index("pkgid")
-            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")
-            break
-    return test_pkg_id
-
-
-def doRemoteCMD(cmd=None):
-    if PARAMETERS.mode == "SDB":
-        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))
-    else:
-        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))
-
-    return doCMD(cmd)
-
-
-def doRemoteCopy(src=None, dest=None):
-    if PARAMETERS.mode == "SDB":
-        cmd_prefix = "sdb -s %s push" % PARAMETERS.device
-        cmd = "%s %s %s" % (cmd_prefix, src, dest)
-    else:
-        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)
-
-    (return_code, output) = doCMD(cmd)
-    doRemoteCMD("sync")
-
-    if return_code != 0:
-        return True
-    else:
-        return False
-
-
-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(".xpk"):
-                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
-                if not pkg_id:
-                    action_status = False
-                    continue
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    (return_code, output) = doRemoteCMD(
-        "rm -rf %s" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    return action_status
-
-
-def instPKGs():
-    action_status = True
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s" % PKG_SRC_DIR)
-    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(".xpk"):
-                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):
-                    action_status = False
-                (return_code, output) = doRemoteCMD(
-                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))
-                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))
-                for line in output:
-                    if "Failure" in line:
-                        action_status = False
-                        break
-
-    # Do some special copy/delete... steps
-    '''
-    (return_code, output) = doRemoteCMD(
-        "mkdir -p %s/tests" % PKG_SRC_DIR)
-    if return_code != 0:
-        action_status = False
-
-    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):
-        action_status = False
-    '''
-
-    return action_status
-
-
-def main():
-    try:
-        usage = "usage: inst.py -i"
-        opts_parser = OptionParser(usage=usage)
-        opts_parser.add_option(
-            "-m", dest="mode", action="store", help="Specify mode")
-        opts_parser.add_option(
-            "-s", dest="device", action="store", help="Specify device")
-        opts_parser.add_option(
-            "-i", dest="binstpkg", action="store_true", help="Install package")
-        opts_parser.add_option(
-            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
-        opts_parser.add_option(
-            "-a", dest="user", action="store", help="User name")
-        global PARAMETERS
-        (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
-        sys.exit(1)
-
-    if not PARAMETERS.user:
-        PARAMETERS.user = "owner"
-    if not PARAMETERS.mode:
-        PARAMETERS.mode = "SDB"
-
-    if PARAMETERS.mode == "SDB":
-        if not PARAMETERS.device:
-            (return_code, output) = doCMD("sdb devices")
-            for line in output:
-                if str.find(line, "\tdevice") != -1:
-                    PARAMETERS.device = line.split("\t")[0]
-                    break
-    else:
-        PARAMETERS.mode = "SSH"
-
-    if not PARAMETERS.device:
-        print "No device provided"
-        sys.exit(1)
-
-    user_info = getUSERID()
-    re_code = user_info[0]
-    if re_code == 0 :
-        global XW_ENV
-        userid = user_info[1][0]
-        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
-    else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
-        sys.exit(1)
-    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
-        sys.exit(1)
-
-    if PARAMETERS.buninstpkg:
-        if not uninstPKGs():
-            sys.exit(1)
-    else:
-        if not instPKGs():
-            sys.exit(1)
-
-if __name__ == "__main__":
-    main()
-    sys.exit(0)
+import configparser\r
+\r
+\r
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))\r
+PKG_NAME = os.path.basename(SCRIPT_DIR)\r
+PARAMETERS = None\r
+#XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"\r
+TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"\r
+tct_parser = configparser.ConfigParser()\r
+tct_parser.read(TCT_CONFIG_FILE)\r
+SRC_DIR = tct_parser.get('DEVICE', 'DEVICE_SUITE_TARGET_30')\r
+PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)\r
+\r
+\r
+def doCMD(cmd):\r
+    # Do not need handle timeout in this short script, let tool do it\r
+    print ("-->> \"%s\"" % cmd)\r
+    output = []\r
+    cmd_return_code = 1\r
+    cmd_proc = subprocess.Popen(\r
+        cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)\r
+\r
+    while True:\r
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")\r
+        cmd_return_code = cmd_proc.poll()\r
+        if output_line == '' and cmd_return_code != None:\r
+            break\r
+        sys.stdout.write("%s\n" % output_line)\r
+        sys.stdout.flush()\r
+        output.append(output_line)\r
+\r
+    return (cmd_return_code, output)\r
+\r
+\r
+def updateCMD(cmd=None):\r
+    if "pkgcmd" in cmd:\r
+        cmd = "su - %s -c '%s;%s'" % (PARAMETERS.user, XW_ENV, cmd)\r
+    return cmd\r
+def getUSERID():\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell id -u %s" % (\r
+            PARAMETERS.device, PARAMETERS.user)\r
+    else:\r
+        cmd = "ssh %s \"id -u %s\"" % (\r
+            PARAMETERS.device, PARAMETERS.user )\r
+    return doCMD(cmd)\r
+\r
+\r
+\r
+\r
+def getPKGID(pkg_name=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (\r
+            PARAMETERS.device, updateCMD('pkgcmd -l'))\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    if return_code != 0:\r
+        return None\r
+\r
+    test_pkg_id = None\r
+    for line in output:\r
+        if line.find("[" + pkg_name + "]") != -1:\r
+            pkgidIndex = line.split().index("pkgid")\r
+            test_pkg_id = line.split()[pkgidIndex+1].strip("[]")\r
+            break\r
+    return test_pkg_id\r
+\r
+\r
+def doRemoteCMD(cmd=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd = "sdb -s %s shell %s" % (PARAMETERS.device, updateCMD(cmd))\r
+    else:\r
+        cmd = "ssh %s \"%s\"" % (PARAMETERS.device, updateCMD(cmd))\r
+\r
+    return doCMD(cmd)\r
+\r
+\r
+def doRemoteCopy(src=None, dest=None):\r
+    if PARAMETERS.mode == "SDB":\r
+        cmd_prefix = "sdb -s %s push" % PARAMETERS.device\r
+        cmd = "%s %s %s" % (cmd_prefix, src, dest)\r
+    else:\r
+        cmd = "scp -r %s %s:/%s" % (src, PARAMETERS.device, dest)\r
+\r
+    (return_code, output) = doCMD(cmd)\r
+    doRemoteCMD("sync")\r
+\r
+    if return_code != 0:\r
+        return True\r
+    else:\r
+        return False\r
+\r
+\r
+def uninstPKGs():\r
+    action_status = True\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))\r
+                if not pkg_id:\r
+                    action_status = False\r
+                    continue\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -u -t xpk -q -n %s" % pkg_id)\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    (return_code, output) = doRemoteCMD(\r
+        "rm -rf %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    return action_status\r
+\r
+\r
+def instPKGs():\r
+    action_status = True\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+    for root, dirs, files in os.walk(SCRIPT_DIR):\r
+        if root.endswith("mediasrc"):\r
+            continue\r
+\r
+        for file in files:\r
+            if file.endswith(".xpk"):\r
+                if not doRemoteCopy(os.path.join(root, file), "%s/%s" % (SRC_DIR, file)):\r
+                    action_status = False\r
+                (return_code, output) = doRemoteCMD(\r
+                    "pkgcmd -i -t xpk -q -p %s/%s" % (SRC_DIR, file))\r
+                doRemoteCMD("rm -rf %s/%s" % (SRC_DIR, file))\r
+                for line in output:\r
+                    if "Failure" in line:\r
+                        action_status = False\r
+                        break\r
+\r
+    # Do some special copy/delete... steps\r
+    '''\r
+    (return_code, output) = doRemoteCMD(\r
+        "mkdir -p %s/tests" % PKG_SRC_DIR)\r
+    if return_code != 0:\r
+        action_status = False\r
+\r
+    if not doRemoteCopy("specname/tests", "%s/tests" % PKG_SRC_DIR):\r
+        action_status = False\r
+    '''\r
+\r
+    return action_status\r
+\r
+\r
+def main():\r
+    try:\r
+        usage = "usage: inst.py -i"\r
+        opts_parser = OptionParser(usage=usage)\r
+        opts_parser.add_option(\r
+            "-m", dest="mode", action="store", help="Specify mode")\r
+        opts_parser.add_option(\r
+            "-s", dest="device", action="store", help="Specify device")\r
+        opts_parser.add_option(\r
+            "-i", dest="binstpkg", action="store_true", help="Install package")\r
+        opts_parser.add_option(\r
+            "-u", dest="buninstpkg", action="store_true", help="Uninstall package")\r
+        opts_parser.add_option(\r
+            "-a", dest="user", action="store", help="User name")\r
+        global PARAMETERS\r
+        (PARAMETERS, args) = opts_parser.parse_args()\r
+    except Exception as e:\r
+        print ("Got wrong option: %s, exit ..." % e)\r
+        sys.exit(1)\r
+\r
+    if not PARAMETERS.user:\r
+        PARAMETERS.user = "owner"\r
+    if not PARAMETERS.mode:\r
+        PARAMETERS.mode = "SDB"\r
+\r
+    if PARAMETERS.mode == "SDB":\r
+        if not PARAMETERS.device:\r
+            (return_code, output) = doCMD("sdb devices")\r
+            for line in output:\r
+                if str.find(line, "\tdevice") != -1:\r
+                    PARAMETERS.device = line.split("\t")[0]\r
+                    break\r
+    else:\r
+        PARAMETERS.mode = "SSH"\r
+\r
+    if not PARAMETERS.device:\r
+        print ("No device provided")\r
+        sys.exit(1)\r
+\r
+    user_info = getUSERID()\r
+    re_code = user_info[0]\r
+    if re_code == 0 :\r
+        global XW_ENV\r
+        userid = user_info[1][0]\r
+        XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)\r
+    else:\r
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))\r
+        sys.exit(1)\r
+    if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:\r
+        print ("-i and -u are conflict")\r
+        sys.exit(1)\r
+\r
+    if PARAMETERS.buninstpkg:\r
+        if not uninstPKGs():\r
+            sys.exit(1)\r
+    else:\r
+        if not instPKGs():\r
+            sys.exit(1)\r
+\r
+if __name__ == "__main__":\r
+    main()\r
+    sys.exit(0)\r

diff --git a/iot/tct-deprecatedapi-tizen-tests/pack.py b/iot/tct-deprecatedapi-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/iot/tct-deprecatedapi-tizen-tests/pack.py
+++ b/iot/tct-deprecatedapi-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/ivi/tct-2dtransforms-css3-tests/inst.apk.py b/ivi/tct-2dtransforms-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-2dtransforms-css3-tests/inst.apk.py
+++ b/ivi/tct-2dtransforms-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-2dtransforms-css3-tests/inst.wgt.py b/ivi/tct-2dtransforms-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-2dtransforms-css3-tests/inst.wgt.py
+++ b/ivi/tct-2dtransforms-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-2dtransforms-css3-tests/inst.xpk.py b/ivi/tct-2dtransforms-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-2dtransforms-css3-tests/inst.xpk.py
+++ b/ivi/tct-2dtransforms-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-3dtransforms-css3-tests/inst.apk.py b/ivi/tct-3dtransforms-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-3dtransforms-css3-tests/inst.apk.py
+++ b/ivi/tct-3dtransforms-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-3dtransforms-css3-tests/inst.wgt.py b/ivi/tct-3dtransforms-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-3dtransforms-css3-tests/inst.wgt.py
+++ b/ivi/tct-3dtransforms-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-3dtransforms-css3-tests/inst.xpk.py b/ivi/tct-3dtransforms-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-3dtransforms-css3-tests/inst.xpk.py
+++ b/ivi/tct-3dtransforms-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-alarm-tizen-tests/inst.apk.py b/ivi/tct-alarm-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-alarm-tizen-tests/inst.apk.py
+++ b/ivi/tct-alarm-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-alarm-tizen-tests/inst.wgt.py b/ivi/tct-alarm-tizen-tests/inst.wgt.py
index 9b50ab82d20e017f7043a81e4c10eeecb0e764ce..90541074075dcb33865a92d798b90edc56bdba98 100755 (executable)
--- a/ivi/tct-alarm-tizen-tests/inst.wgt.py
+++ b/ivi/tct-alarm-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -160,8 +160,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -180,7 +180,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -190,10 +190,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-alarm-tizen-tests/inst.xpk.py b/ivi/tct-alarm-tizen-tests/inst.xpk.py
index 2b58ff6078903e030842bdae469b87ecedcd6028..635947096db8228fb2a0790daa038003fb2c760a 100755 (executable)
--- a/ivi/tct-alarm-tizen-tests/inst.xpk.py
+++ b/ivi/tct-alarm-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -162,8 +162,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -182,7 +182,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -192,10 +192,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animations-css3-tests/inst.apk.py b/ivi/tct-animations-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-animations-css3-tests/inst.apk.py
+++ b/ivi/tct-animations-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animations-css3-tests/inst.wgt.py b/ivi/tct-animations-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-animations-css3-tests/inst.wgt.py
+++ b/ivi/tct-animations-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animations-css3-tests/inst.xpk.py b/ivi/tct-animations-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-animations-css3-tests/inst.xpk.py
+++ b/ivi/tct-animations-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animationtiming-w3c-tests/inst.apk.py b/ivi/tct-animationtiming-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-animationtiming-w3c-tests/inst.apk.py
+++ b/ivi/tct-animationtiming-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animationtiming-w3c-tests/inst.wgt.py b/ivi/tct-animationtiming-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-animationtiming-w3c-tests/inst.wgt.py
+++ b/ivi/tct-animationtiming-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-animationtiming-w3c-tests/inst.xpk.py b/ivi/tct-animationtiming-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-animationtiming-w3c-tests/inst.xpk.py
+++ b/ivi/tct-animationtiming-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcache-html5-tests/inst.apk.py b/ivi/tct-appcache-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-appcache-html5-tests/inst.apk.py
+++ b/ivi/tct-appcache-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcache-html5-tests/inst.wgt.py b/ivi/tct-appcache-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-appcache-html5-tests/inst.wgt.py
+++ b/ivi/tct-appcache-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcache-html5-tests/inst.xpk.py b/ivi/tct-appcache-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-appcache-html5-tests/inst.xpk.py
+++ b/ivi/tct-appcache-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcontrol-tizen-tests/inst.apk.py b/ivi/tct-appcontrol-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-appcontrol-tizen-tests/inst.apk.py
+++ b/ivi/tct-appcontrol-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcontrol-tizen-tests/inst.wgt.py b/ivi/tct-appcontrol-tizen-tests/inst.wgt.py
index f328736e354a2d31bd40e2665a5d1b9435793fad..3a6af9945e361faaa2018b7f3cb797d61b20de83 100755 (executable)
--- a/ivi/tct-appcontrol-tizen-tests/inst.wgt.py
+++ b/ivi/tct-appcontrol-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -175,8 +175,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -195,7 +195,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -205,10 +205,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-appcontrol-tizen-tests/inst.xpk.py b/ivi/tct-appcontrol-tizen-tests/inst.xpk.py
index 7fd56564471e1f106c8d92f058b03641362a8c2b..68a7a7cb45c55eb2ece0852c00fe885ea953d207 100755 (executable)
--- a/ivi/tct-appcontrol-tizen-tests/inst.xpk.py
+++ b/ivi/tct-appcontrol-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -175,8 +175,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -195,7 +195,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -205,10 +205,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-application-tizen-tests/inst.apk.py b/ivi/tct-application-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-application-tizen-tests/inst.apk.py
+++ b/ivi/tct-application-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-application-tizen-tests/inst.wgt.py b/ivi/tct-application-tizen-tests/inst.wgt.py
index 24141f7f42e73cf01079f878080f69b84328b4e7..ec7da2954d29c87adc8d590d9089b26d77e12eba 100755 (executable)
--- a/ivi/tct-application-tizen-tests/inst.wgt.py
+++ b/ivi/tct-application-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-application-tizen-tests/inst.xpk.py b/ivi/tct-application-tizen-tests/inst.xpk.py
index ccd694af4d5dfa92b257d1efbd1e7099841482c8..fbe31c4928b700901e20e8f9ebfe57cf63475021 100755 (executable)
--- a/ivi/tct-application-tizen-tests/inst.xpk.py
+++ b/ivi/tct-application-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-audio-html5-tests/inst.apk.py b/ivi/tct-audio-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-audio-html5-tests/inst.apk.py
+++ b/ivi/tct-audio-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-audio-html5-tests/inst.wgt.py b/ivi/tct-audio-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-audio-html5-tests/inst.wgt.py
+++ b/ivi/tct-audio-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-audio-html5-tests/inst.xpk.py b/ivi/tct-audio-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-audio-html5-tests/inst.xpk.py
+++ b/ivi/tct-audio-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-backgrounds-css3-tests/inst.apk.py b/ivi/tct-backgrounds-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-backgrounds-css3-tests/inst.apk.py
+++ b/ivi/tct-backgrounds-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-backgrounds-css3-tests/inst.wgt.py b/ivi/tct-backgrounds-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-backgrounds-css3-tests/inst.wgt.py
+++ b/ivi/tct-backgrounds-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-backgrounds-css3-tests/inst.xpk.py b/ivi/tct-backgrounds-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-backgrounds-css3-tests/inst.xpk.py
+++ b/ivi/tct-backgrounds-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bluetooth-tizen-tests/inst.apk.py b/ivi/tct-bluetooth-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-bluetooth-tizen-tests/inst.apk.py
+++ b/ivi/tct-bluetooth-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bluetooth-tizen-tests/inst.wgt.py b/ivi/tct-bluetooth-tizen-tests/inst.wgt.py
index d26375e7166eb9b963be430f4f6129aacd472c6a..59454337abbea467d97b1cb944584e55d201739c 100755 (executable)
--- a/ivi/tct-bluetooth-tizen-tests/inst.wgt.py
+++ b/ivi/tct-bluetooth-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -162,8 +162,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -182,7 +182,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -192,10 +192,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bluetooth-tizen-tests/inst.xpk.py b/ivi/tct-bluetooth-tizen-tests/inst.xpk.py
index 2b58ff6078903e030842bdae469b87ecedcd6028..635947096db8228fb2a0790daa038003fb2c760a 100755 (executable)
--- a/ivi/tct-bluetooth-tizen-tests/inst.xpk.py
+++ b/ivi/tct-bluetooth-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -162,8 +162,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -182,7 +182,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -192,10 +192,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bookmark-tizen-tests/inst.apk.py b/ivi/tct-bookmark-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-bookmark-tizen-tests/inst.apk.py
+++ b/ivi/tct-bookmark-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bookmark-tizen-tests/inst.wgt.py b/ivi/tct-bookmark-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-bookmark-tizen-tests/inst.wgt.py
+++ b/ivi/tct-bookmark-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-bookmark-tizen-tests/inst.xpk.py b/ivi/tct-bookmark-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-bookmark-tizen-tests/inst.xpk.py
+++ b/ivi/tct-bookmark-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-browserstate-html5-tests/inst.apk.py b/ivi/tct-browserstate-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-browserstate-html5-tests/inst.apk.py
+++ b/ivi/tct-browserstate-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-browserstate-html5-tests/inst.wgt.py b/ivi/tct-browserstate-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-browserstate-html5-tests/inst.wgt.py
+++ b/ivi/tct-browserstate-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-browserstate-html5-tests/inst.xpk.py b/ivi/tct-browserstate-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-browserstate-html5-tests/inst.xpk.py
+++ b/ivi/tct-browserstate-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-canvas-html5-tests/inst.apk.py b/ivi/tct-canvas-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-canvas-html5-tests/inst.apk.py
+++ b/ivi/tct-canvas-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-canvas-html5-tests/inst.wgt.py b/ivi/tct-canvas-html5-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-canvas-html5-tests/inst.wgt.py
+++ b/ivi/tct-canvas-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-canvas-html5-tests/inst.xpk.py b/ivi/tct-canvas-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-canvas-html5-tests/inst.xpk.py
+++ b/ivi/tct-canvas-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-capability-tests/inst.apk.py b/ivi/tct-capability-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-capability-tests/inst.apk.py
+++ b/ivi/tct-capability-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-capability-tests/inst.wgt.py b/ivi/tct-capability-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-capability-tests/inst.wgt.py
+++ b/ivi/tct-capability-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-capability-tests/inst.xpk.py b/ivi/tct-capability-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-capability-tests/inst.xpk.py
+++ b/ivi/tct-capability-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-clipboard-w3c-tests/inst.apk.py b/ivi/tct-clipboard-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-clipboard-w3c-tests/inst.apk.py
+++ b/ivi/tct-clipboard-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-clipboard-w3c-tests/inst.wgt.py b/ivi/tct-clipboard-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-clipboard-w3c-tests/inst.wgt.py
+++ b/ivi/tct-clipboard-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-clipboard-w3c-tests/inst.xpk.py b/ivi/tct-clipboard-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-clipboard-w3c-tests/inst.xpk.py
+++ b/ivi/tct-clipboard-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-colors-css3-tests/inst.apk.py b/ivi/tct-colors-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-colors-css3-tests/inst.apk.py
+++ b/ivi/tct-colors-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-colors-css3-tests/inst.wgt.py b/ivi/tct-colors-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-colors-css3-tests/inst.wgt.py
+++ b/ivi/tct-colors-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-colors-css3-tests/inst.xpk.py b/ivi/tct-colors-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-colors-css3-tests/inst.xpk.py
+++ b/ivi/tct-colors-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-content-tizen-tests/inst.apk.py b/ivi/tct-content-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-content-tizen-tests/inst.apk.py
+++ b/ivi/tct-content-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-content-tizen-tests/inst.wgt.py b/ivi/tct-content-tizen-tests/inst.wgt.py
index 9cf8713a38d1b777c1c9e78e5d0445804f080a53..99d1a488c60d1df9b6ddca590184ccadb4a2ff1b 100755 (executable)
--- a/ivi/tct-content-tizen-tests/inst.wgt.py
+++ b/ivi/tct-content-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -169,8 +169,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -189,7 +189,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -199,10 +199,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-content-tizen-tests/inst.xpk.py b/ivi/tct-content-tizen-tests/inst.xpk.py
index 489c5efc918da7f2b9a096276857816b9fa33fca..9604d78981640a8cafc17b1696cf21e575cf8c1a 100755 (executable)
--- a/ivi/tct-content-tizen-tests/inst.xpk.py
+++ b/ivi/tct-content-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -169,8 +169,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -189,7 +189,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -199,10 +199,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-cors-w3c-tests/inst.apk.py b/ivi/tct-cors-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-cors-w3c-tests/inst.apk.py
+++ b/ivi/tct-cors-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-cors-w3c-tests/inst.wgt.py b/ivi/tct-cors-w3c-tests/inst.wgt.py
index e4ea5495f8eee09a358794a0298c58b8070746ec..89d4de707d4721d2fa21d64b35f9d7915dc3b4a2 100755 (executable)
--- a/ivi/tct-cors-w3c-tests/inst.wgt.py
+++ b/ivi/tct-cors-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-cors-w3c-tests/inst.xpk.py b/ivi/tct-cors-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-cors-w3c-tests/inst.xpk.py
+++ b/ivi/tct-cors-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-csp-w3c-tests/inst.apk.py b/ivi/tct-csp-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-csp-w3c-tests/inst.apk.py
+++ b/ivi/tct-csp-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-csp-w3c-tests/inst.wgt.py b/ivi/tct-csp-w3c-tests/inst.wgt.py
index a7ea7b578c1e04ebd88e0d8d11686bf75c8d4cea..109ff4430c872a58a6915663d3ac435f4d3fe183 100755 (executable)
--- a/ivi/tct-csp-w3c-tests/inst.wgt.py
+++ b/ivi/tct-csp-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-csp-w3c-tests/inst.xpk.py b/ivi/tct-csp-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-csp-w3c-tests/inst.xpk.py
+++ b/ivi/tct-csp-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-dnd-html5-tests/inst.apk.py b/ivi/tct-dnd-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-dnd-html5-tests/inst.apk.py
+++ b/ivi/tct-dnd-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-dnd-html5-tests/inst.wgt.py b/ivi/tct-dnd-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-dnd-html5-tests/inst.wgt.py
+++ b/ivi/tct-dnd-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-dnd-html5-tests/inst.xpk.py b/ivi/tct-dnd-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-dnd-html5-tests/inst.xpk.py
+++ b/ivi/tct-dnd-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-download-tizen-tests/inst.apk.py b/ivi/tct-download-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-download-tizen-tests/inst.apk.py
+++ b/ivi/tct-download-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-download-tizen-tests/inst.wgt.py b/ivi/tct-download-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-download-tizen-tests/inst.wgt.py
+++ b/ivi/tct-download-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-download-tizen-tests/inst.xpk.py b/ivi/tct-download-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-download-tizen-tests/inst.xpk.py
+++ b/ivi/tct-download-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-extra-html5-tests/inst.apk.py b/ivi/tct-extra-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-extra-html5-tests/inst.apk.py
+++ b/ivi/tct-extra-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-extra-html5-tests/inst.wgt.py b/ivi/tct-extra-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-extra-html5-tests/inst.wgt.py
+++ b/ivi/tct-extra-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-extra-html5-tests/inst.xpk.py b/ivi/tct-extra-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-extra-html5-tests/inst.xpk.py
+++ b/ivi/tct-extra-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fileapi-w3c-tests/inst.apk.py b/ivi/tct-fileapi-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-fileapi-w3c-tests/inst.apk.py
+++ b/ivi/tct-fileapi-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fileapi-w3c-tests/inst.wgt.py b/ivi/tct-fileapi-w3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-fileapi-w3c-tests/inst.wgt.py
+++ b/ivi/tct-fileapi-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fileapi-w3c-tests/inst.xpk.py b/ivi/tct-fileapi-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-fileapi-w3c-tests/inst.xpk.py
+++ b/ivi/tct-fileapi-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystem-tizen-tests/inst.apk.py b/ivi/tct-filesystem-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-filesystem-tizen-tests/inst.apk.py
+++ b/ivi/tct-filesystem-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystem-tizen-tests/inst.wgt.py b/ivi/tct-filesystem-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-filesystem-tizen-tests/inst.wgt.py
+++ b/ivi/tct-filesystem-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystem-tizen-tests/inst.xpk.py b/ivi/tct-filesystem-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-filesystem-tizen-tests/inst.xpk.py
+++ b/ivi/tct-filesystem-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystemapi-w3c-tests/inst.apk.py b/ivi/tct-filesystemapi-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-filesystemapi-w3c-tests/inst.apk.py
+++ b/ivi/tct-filesystemapi-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystemapi-w3c-tests/inst.wgt.py b/ivi/tct-filesystemapi-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-filesystemapi-w3c-tests/inst.wgt.py
+++ b/ivi/tct-filesystemapi-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filesystemapi-w3c-tests/inst.xpk.py b/ivi/tct-filesystemapi-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-filesystemapi-w3c-tests/inst.xpk.py
+++ b/ivi/tct-filesystemapi-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filewriterapi-w3c-tests/inst.apk.py b/ivi/tct-filewriterapi-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-filewriterapi-w3c-tests/inst.apk.py
+++ b/ivi/tct-filewriterapi-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filewriterapi-w3c-tests/inst.wgt.py b/ivi/tct-filewriterapi-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-filewriterapi-w3c-tests/inst.wgt.py
+++ b/ivi/tct-filewriterapi-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-filewriterapi-w3c-tests/inst.xpk.py b/ivi/tct-filewriterapi-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-filewriterapi-w3c-tests/inst.xpk.py
+++ b/ivi/tct-filewriterapi-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-flexiblebox-css3-tests/inst.apk.py b/ivi/tct-flexiblebox-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-flexiblebox-css3-tests/inst.apk.py
+++ b/ivi/tct-flexiblebox-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-flexiblebox-css3-tests/inst.wgt.py b/ivi/tct-flexiblebox-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-flexiblebox-css3-tests/inst.wgt.py
+++ b/ivi/tct-flexiblebox-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-flexiblebox-css3-tests/inst.xpk.py b/ivi/tct-flexiblebox-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-flexiblebox-css3-tests/inst.xpk.py
+++ b/ivi/tct-flexiblebox-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fonts-css3-tests/inst.apk.py b/ivi/tct-fonts-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-fonts-css3-tests/inst.apk.py
+++ b/ivi/tct-fonts-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fonts-css3-tests/inst.wgt.py b/ivi/tct-fonts-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-fonts-css3-tests/inst.wgt.py
+++ b/ivi/tct-fonts-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fonts-css3-tests/inst.xpk.py b/ivi/tct-fonts-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-fonts-css3-tests/inst.xpk.py
+++ b/ivi/tct-fonts-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-forms-html5-tests/inst.apk.py b/ivi/tct-forms-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-forms-html5-tests/inst.apk.py
+++ b/ivi/tct-forms-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-forms-html5-tests/inst.wgt.py b/ivi/tct-forms-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-forms-html5-tests/inst.wgt.py
+++ b/ivi/tct-forms-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-forms-html5-tests/inst.xpk.py b/ivi/tct-forms-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-forms-html5-tests/inst.xpk.py
+++ b/ivi/tct-forms-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fullscreen-nonw3c-tests/inst.apk.py b/ivi/tct-fullscreen-nonw3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-fullscreen-nonw3c-tests/inst.apk.py
+++ b/ivi/tct-fullscreen-nonw3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fullscreen-nonw3c-tests/inst.wgt.py b/ivi/tct-fullscreen-nonw3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-fullscreen-nonw3c-tests/inst.wgt.py
+++ b/ivi/tct-fullscreen-nonw3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-fullscreen-nonw3c-tests/inst.xpk.py b/ivi/tct-fullscreen-nonw3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-fullscreen-nonw3c-tests/inst.xpk.py
+++ b/ivi/tct-fullscreen-nonw3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geoallow-w3c-tests/inst.apk.py b/ivi/tct-geoallow-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-geoallow-w3c-tests/inst.apk.py
+++ b/ivi/tct-geoallow-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geoallow-w3c-tests/inst.wgt.py b/ivi/tct-geoallow-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-geoallow-w3c-tests/inst.wgt.py
+++ b/ivi/tct-geoallow-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geoallow-w3c-tests/inst.xpk.py b/ivi/tct-geoallow-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-geoallow-w3c-tests/inst.xpk.py
+++ b/ivi/tct-geoallow-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geodeny-w3c-tests/inst.apk.py b/ivi/tct-geodeny-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-geodeny-w3c-tests/inst.apk.py
+++ b/ivi/tct-geodeny-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geodeny-w3c-tests/inst.wgt.py b/ivi/tct-geodeny-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-geodeny-w3c-tests/inst.wgt.py
+++ b/ivi/tct-geodeny-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-geodeny-w3c-tests/inst.xpk.py b/ivi/tct-geodeny-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-geodeny-w3c-tests/inst.xpk.py
+++ b/ivi/tct-geodeny-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-getcapabilities/inst.apk.py b/ivi/tct-getcapabilities/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-getcapabilities/inst.apk.py
+++ b/ivi/tct-getcapabilities/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-getcapabilities/inst.wgt.py b/ivi/tct-getcapabilities/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-getcapabilities/inst.wgt.py
+++ b/ivi/tct-getcapabilities/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-getcapabilities/inst.xpk.py b/ivi/tct-getcapabilities/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-getcapabilities/inst.xpk.py
+++ b/ivi/tct-getcapabilities/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-gumallow-w3c-tests/inst.apk.py b/ivi/tct-gumallow-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-gumallow-w3c-tests/inst.apk.py
+++ b/ivi/tct-gumallow-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-gumallow-w3c-tests/inst.wgt.py b/ivi/tct-gumallow-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-gumallow-w3c-tests/inst.wgt.py
+++ b/ivi/tct-gumallow-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-gumallow-w3c-tests/inst.xpk.py b/ivi/tct-gumallow-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-gumallow-w3c-tests/inst.xpk.py
+++ b/ivi/tct-gumallow-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-indexeddb-w3c-tests/inst.apk.py b/ivi/tct-indexeddb-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-indexeddb-w3c-tests/inst.apk.py
+++ b/ivi/tct-indexeddb-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-indexeddb-w3c-tests/inst.wgt.py b/ivi/tct-indexeddb-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-indexeddb-w3c-tests/inst.wgt.py
+++ b/ivi/tct-indexeddb-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-indexeddb-w3c-tests/inst.xpk.py b/ivi/tct-indexeddb-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-indexeddb-w3c-tests/inst.xpk.py
+++ b/ivi/tct-indexeddb-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-jsenhance-html5-tests/inst.apk.py b/ivi/tct-jsenhance-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-jsenhance-html5-tests/inst.apk.py
+++ b/ivi/tct-jsenhance-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-jsenhance-html5-tests/inst.wgt.py b/ivi/tct-jsenhance-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-jsenhance-html5-tests/inst.wgt.py
+++ b/ivi/tct-jsenhance-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-jsenhance-html5-tests/inst.xpk.py b/ivi/tct-jsenhance-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-jsenhance-html5-tests/inst.xpk.py
+++ b/ivi/tct-jsenhance-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-mediaqueries-css3-tests/inst.apk.py b/ivi/tct-mediaqueries-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-mediaqueries-css3-tests/inst.apk.py
+++ b/ivi/tct-mediaqueries-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-mediaqueries-css3-tests/inst.wgt.py b/ivi/tct-mediaqueries-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-mediaqueries-css3-tests/inst.wgt.py
+++ b/ivi/tct-mediaqueries-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-mediaqueries-css3-tests/inst.xpk.py b/ivi/tct-mediaqueries-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-mediaqueries-css3-tests/inst.xpk.py
+++ b/ivi/tct-mediaqueries-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-messageport-tizen-tests/inst.apk.py b/ivi/tct-messageport-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-messageport-tizen-tests/inst.apk.py
+++ b/ivi/tct-messageport-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-messageport-tizen-tests/inst.wgt.py b/ivi/tct-messageport-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-messageport-tizen-tests/inst.wgt.py
+++ b/ivi/tct-messageport-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-messageport-tizen-tests/inst.xpk.py b/ivi/tct-messageport-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-messageport-tizen-tests/inst.xpk.py
+++ b/ivi/tct-messageport-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-multicolumn-css3-tests/inst.apk.py b/ivi/tct-multicolumn-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-multicolumn-css3-tests/inst.apk.py
+++ b/ivi/tct-multicolumn-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-multicolumn-css3-tests/inst.wgt.py b/ivi/tct-multicolumn-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-multicolumn-css3-tests/inst.wgt.py
+++ b/ivi/tct-multicolumn-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-multicolumn-css3-tests/inst.xpk.py b/ivi/tct-multicolumn-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-multicolumn-css3-tests/inst.xpk.py
+++ b/ivi/tct-multicolumn-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-namespace-tizen-tests/inst.apk.py b/ivi/tct-namespace-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-namespace-tizen-tests/inst.apk.py
+++ b/ivi/tct-namespace-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-namespace-tizen-tests/inst.wgt.py b/ivi/tct-namespace-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-namespace-tizen-tests/inst.wgt.py
+++ b/ivi/tct-namespace-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-namespace-tizen-tests/inst.xpk.py b/ivi/tct-namespace-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-namespace-tizen-tests/inst.xpk.py
+++ b/ivi/tct-namespace-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-navigationtiming-w3c-tests/inst.apk.py b/ivi/tct-navigationtiming-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-navigationtiming-w3c-tests/inst.apk.py
+++ b/ivi/tct-navigationtiming-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-navigationtiming-w3c-tests/inst.wgt.py b/ivi/tct-navigationtiming-w3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-navigationtiming-w3c-tests/inst.wgt.py
+++ b/ivi/tct-navigationtiming-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-navigationtiming-w3c-tests/inst.xpk.py b/ivi/tct-navigationtiming-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-navigationtiming-w3c-tests/inst.xpk.py
+++ b/ivi/tct-navigationtiming-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-tizen-tests/inst.apk.py b/ivi/tct-notification-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-notification-tizen-tests/inst.apk.py
+++ b/ivi/tct-notification-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-tizen-tests/inst.wgt.py b/ivi/tct-notification-tizen-tests/inst.wgt.py
index 58fa04cbf56b3b8b142a5c5922aa70c6f66f1d1b..ceefce39d65947361b2a1582de8cbe4327247cb0 100755 (executable)
--- a/ivi/tct-notification-tizen-tests/inst.wgt.py
+++ b/ivi/tct-notification-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -184,8 +184,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -204,7 +204,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -214,10 +214,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-tizen-tests/inst.xpk.py b/ivi/tct-notification-tizen-tests/inst.xpk.py
index 24c3069351f76f76b795458ae6e243dc5b5ffd6f..1d56a7d9128fe6f381b89363f38aab42b0024422 100755 (executable)
--- a/ivi/tct-notification-tizen-tests/inst.xpk.py
+++ b/ivi/tct-notification-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -184,8 +184,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -204,7 +204,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -214,10 +214,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-w3c-tests/inst.apk.py b/ivi/tct-notification-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-notification-w3c-tests/inst.apk.py
+++ b/ivi/tct-notification-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-w3c-tests/inst.wgt.py b/ivi/tct-notification-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-notification-w3c-tests/inst.wgt.py
+++ b/ivi/tct-notification-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-notification-w3c-tests/inst.xpk.py b/ivi/tct-notification-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-notification-w3c-tests/inst.xpk.py
+++ b/ivi/tct-notification-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-package-tizen-tests/inst.apk.py b/ivi/tct-package-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-package-tizen-tests/inst.apk.py
+++ b/ivi/tct-package-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-package-tizen-tests/inst.wgt.py b/ivi/tct-package-tizen-tests/inst.wgt.py
index 6fce2fba5c8fd341c6be4daac3371a68231a70a8..3f6a9265ee7534722d782d3139728d1978740a6a 100755 (executable)
--- a/ivi/tct-package-tizen-tests/inst.wgt.py
+++ b/ivi/tct-package-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -176,8 +176,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -196,7 +196,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -206,10 +206,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-package-tizen-tests/inst.xpk.py b/ivi/tct-package-tizen-tests/inst.xpk.py
index 25ce6831d6c38f408266cd22cc660e3b4b996759..3ec8311ff6d85be2c7faf71d6b8a8cb59309c09a 100755 (executable)
--- a/ivi/tct-package-tizen-tests/inst.xpk.py
+++ b/ivi/tct-package-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -176,8 +176,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -196,7 +196,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -206,10 +206,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-pagevisibility-w3c-tests/inst.apk.py b/ivi/tct-pagevisibility-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-pagevisibility-w3c-tests/inst.apk.py
+++ b/ivi/tct-pagevisibility-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-pagevisibility-w3c-tests/inst.wgt.py b/ivi/tct-pagevisibility-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-pagevisibility-w3c-tests/inst.wgt.py
+++ b/ivi/tct-pagevisibility-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-pagevisibility-w3c-tests/inst.xpk.py b/ivi/tct-pagevisibility-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-pagevisibility-w3c-tests/inst.xpk.py
+++ b/ivi/tct-pagevisibility-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-power-tizen-tests/inst.apk.py b/ivi/tct-power-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-power-tizen-tests/inst.apk.py
+++ b/ivi/tct-power-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-power-tizen-tests/inst.wgt.py b/ivi/tct-power-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-power-tizen-tests/inst.wgt.py
+++ b/ivi/tct-power-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-power-tizen-tests/inst.xpk.py b/ivi/tct-power-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-power-tizen-tests/inst.xpk.py
+++ b/ivi/tct-power-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-privilege-tizen-tests/inst.apk.py b/ivi/tct-privilege-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-privilege-tizen-tests/inst.apk.py
+++ b/ivi/tct-privilege-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-privilege-tizen-tests/inst.wgt.py b/ivi/tct-privilege-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-privilege-tizen-tests/inst.wgt.py
+++ b/ivi/tct-privilege-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-privilege-tizen-tests/inst.xpk.py b/ivi/tct-privilege-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-privilege-tizen-tests/inst.xpk.py
+++ b/ivi/tct-privilege-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sandbox-html5-tests/inst.apk.py b/ivi/tct-sandbox-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-sandbox-html5-tests/inst.apk.py
+++ b/ivi/tct-sandbox-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sandbox-html5-tests/inst.wgt.py b/ivi/tct-sandbox-html5-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-sandbox-html5-tests/inst.wgt.py
+++ b/ivi/tct-sandbox-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sandbox-html5-tests/inst.xpk.py b/ivi/tct-sandbox-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-sandbox-html5-tests/inst.xpk.py
+++ b/ivi/tct-sandbox-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-screenorientation-w3c-tests/inst.apk.py b/ivi/tct-screenorientation-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-screenorientation-w3c-tests/inst.apk.py
+++ b/ivi/tct-screenorientation-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-screenorientation-w3c-tests/inst.wgt.py b/ivi/tct-screenorientation-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-screenorientation-w3c-tests/inst.wgt.py
+++ b/ivi/tct-screenorientation-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-screenorientation-w3c-tests/inst.xpk.py b/ivi/tct-screenorientation-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-screenorientation-w3c-tests/inst.xpk.py
+++ b/ivi/tct-screenorientation-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-security-tcs-tests/inst.apk.py b/ivi/tct-security-tcs-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-security-tcs-tests/inst.apk.py
+++ b/ivi/tct-security-tcs-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-security-tcs-tests/inst.wgt.py b/ivi/tct-security-tcs-tests/inst.wgt.py
index d26375e7166eb9b963be430f4f6129aacd472c6a..59454337abbea467d97b1cb944584e55d201739c 100755 (executable)
--- a/ivi/tct-security-tcs-tests/inst.wgt.py
+++ b/ivi/tct-security-tcs-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -162,8 +162,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -182,7 +182,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -192,10 +192,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-security-tcs-tests/inst.xpk.py b/ivi/tct-security-tcs-tests/inst.xpk.py
index 2b58ff6078903e030842bdae469b87ecedcd6028..635947096db8228fb2a0790daa038003fb2c760a 100755 (executable)
--- a/ivi/tct-security-tcs-tests/inst.xpk.py
+++ b/ivi/tct-security-tcs-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -162,8 +162,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -182,7 +182,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -192,10 +192,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel1-w3c-tests/inst.apk.py b/ivi/tct-selectorslevel1-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-selectorslevel1-w3c-tests/inst.apk.py
+++ b/ivi/tct-selectorslevel1-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel1-w3c-tests/inst.wgt.py b/ivi/tct-selectorslevel1-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-selectorslevel1-w3c-tests/inst.wgt.py
+++ b/ivi/tct-selectorslevel1-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel1-w3c-tests/inst.xpk.py b/ivi/tct-selectorslevel1-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-selectorslevel1-w3c-tests/inst.xpk.py
+++ b/ivi/tct-selectorslevel1-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel2-w3c-tests/inst.apk.py b/ivi/tct-selectorslevel2-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-selectorslevel2-w3c-tests/inst.apk.py
+++ b/ivi/tct-selectorslevel2-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel2-w3c-tests/inst.wgt.py b/ivi/tct-selectorslevel2-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-selectorslevel2-w3c-tests/inst.wgt.py
+++ b/ivi/tct-selectorslevel2-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-selectorslevel2-w3c-tests/inst.xpk.py b/ivi/tct-selectorslevel2-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-selectorslevel2-w3c-tests/inst.xpk.py
+++ b/ivi/tct-selectorslevel2-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sessionhistory-html5-tests/inst.apk.py b/ivi/tct-sessionhistory-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-sessionhistory-html5-tests/inst.apk.py
+++ b/ivi/tct-sessionhistory-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sessionhistory-html5-tests/inst.wgt.py b/ivi/tct-sessionhistory-html5-tests/inst.wgt.py
index c21cdecdaedb5c0a96f8ea95b0857fdc1efa9b93..f11e570b789835a138ac679b5af0652f488a034a 100755 (executable)
--- a/ivi/tct-sessionhistory-html5-tests/inst.wgt.py
+++ b/ivi/tct-sessionhistory-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sessionhistory-html5-tests/inst.xpk.py b/ivi/tct-sessionhistory-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-sessionhistory-html5-tests/inst.xpk.py
+++ b/ivi/tct-sessionhistory-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sse-w3c-tests/inst.apk.py b/ivi/tct-sse-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-sse-w3c-tests/inst.apk.py
+++ b/ivi/tct-sse-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sse-w3c-tests/inst.wgt.py b/ivi/tct-sse-w3c-tests/inst.wgt.py
index afef62e723d39dd1eb9179236c87fc1c3b1c0c5a..ebb8353d1eedf6800fac4a64c57dcff782232bda 100755 (executable)
--- a/ivi/tct-sse-w3c-tests/inst.wgt.py
+++ b/ivi/tct-sse-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -180,8 +180,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -200,7 +200,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -210,10 +210,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-sse-w3c-tests/inst.xpk.py b/ivi/tct-sse-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-sse-w3c-tests/inst.xpk.py
+++ b/ivi/tct-sse-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-svg-html5-tests/inst.apk.py b/ivi/tct-svg-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-svg-html5-tests/inst.apk.py
+++ b/ivi/tct-svg-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-svg-html5-tests/inst.wgt.py b/ivi/tct-svg-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-svg-html5-tests/inst.wgt.py
+++ b/ivi/tct-svg-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-svg-html5-tests/inst.xpk.py b/ivi/tct-svg-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-svg-html5-tests/inst.xpk.py
+++ b/ivi/tct-svg-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systeminfo-tizen-tests/inst.apk.py b/ivi/tct-systeminfo-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-systeminfo-tizen-tests/inst.apk.py
+++ b/ivi/tct-systeminfo-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systeminfo-tizen-tests/inst.wgt.py b/ivi/tct-systeminfo-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-systeminfo-tizen-tests/inst.wgt.py
+++ b/ivi/tct-systeminfo-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systeminfo-tizen-tests/inst.xpk.py b/ivi/tct-systeminfo-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-systeminfo-tizen-tests/inst.xpk.py
+++ b/ivi/tct-systeminfo-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systemsetting-tizen-tests/inst.apk.py b/ivi/tct-systemsetting-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-systemsetting-tizen-tests/inst.apk.py
+++ b/ivi/tct-systemsetting-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systemsetting-tizen-tests/inst.wgt.py b/ivi/tct-systemsetting-tizen-tests/inst.wgt.py
index e7aeac9ec9c849f80bdcecb8ded5984a2f9cf01a..f2417bdad8da8f51996c6eaaaa75150b36450481 100755 (executable)
--- a/ivi/tct-systemsetting-tizen-tests/inst.wgt.py
+++ b/ivi/tct-systemsetting-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -169,8 +169,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -189,7 +189,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -199,10 +199,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-systemsetting-tizen-tests/inst.xpk.py b/ivi/tct-systemsetting-tizen-tests/inst.xpk.py
index 8a8ed798d188ff9c8938140dcf001c0bdccaeb00..cadbfcc446bc6f862877ebf4a2f7ffd49d3910e5 100755 (executable)
--- a/ivi/tct-systemsetting-tizen-tests/inst.xpk.py
+++ b/ivi/tct-systemsetting-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -169,8 +169,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -189,7 +189,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -199,10 +199,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-testconfig/inst.apk.py b/ivi/tct-testconfig/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-testconfig/inst.apk.py
+++ b/ivi/tct-testconfig/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-testconfig/inst.wgt.py b/ivi/tct-testconfig/inst.wgt.py
index 183d9078e8c022482637e723e940de4ac8fc0582..87ca4d61223a0b2292346b32ec1b13e10227ff8f 100755 (executable)
--- a/ivi/tct-testconfig/inst.wgt.py
+++ b/ivi/tct-testconfig/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -139,8 +139,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -159,7 +159,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -169,10 +169,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-testconfig/inst.xpk.py b/ivi/tct-testconfig/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-testconfig/inst.xpk.py
+++ b/ivi/tct-testconfig/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-time-tizen-tests/inst.apk.py b/ivi/tct-time-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-time-tizen-tests/inst.apk.py
+++ b/ivi/tct-time-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-time-tizen-tests/inst.wgt.py b/ivi/tct-time-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-time-tizen-tests/inst.wgt.py
+++ b/ivi/tct-time-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-time-tizen-tests/inst.xpk.py b/ivi/tct-time-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-time-tizen-tests/inst.xpk.py
+++ b/ivi/tct-time-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-tizen-tizen-tests/inst.apk.py b/ivi/tct-tizen-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-tizen-tizen-tests/inst.apk.py
+++ b/ivi/tct-tizen-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-tizen-tizen-tests/inst.wgt.py b/ivi/tct-tizen-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-tizen-tizen-tests/inst.wgt.py
+++ b/ivi/tct-tizen-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-tizen-tizen-tests/inst.xpk.py b/ivi/tct-tizen-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-tizen-tizen-tests/inst.xpk.py
+++ b/ivi/tct-tizen-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-touchevent-w3c-tests/inst.apk.py b/ivi/tct-touchevent-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-touchevent-w3c-tests/inst.apk.py
+++ b/ivi/tct-touchevent-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-touchevent-w3c-tests/inst.wgt.py b/ivi/tct-touchevent-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-touchevent-w3c-tests/inst.wgt.py
+++ b/ivi/tct-touchevent-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-touchevent-w3c-tests/inst.xpk.py b/ivi/tct-touchevent-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-touchevent-w3c-tests/inst.xpk.py
+++ b/ivi/tct-touchevent-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-transitions-css3-tests/inst.apk.py b/ivi/tct-transitions-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-transitions-css3-tests/inst.apk.py
+++ b/ivi/tct-transitions-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-transitions-css3-tests/inst.wgt.py b/ivi/tct-transitions-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-transitions-css3-tests/inst.wgt.py
+++ b/ivi/tct-transitions-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-transitions-css3-tests/inst.xpk.py b/ivi/tct-transitions-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-transitions-css3-tests/inst.xpk.py
+++ b/ivi/tct-transitions-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-typedarrays-nonw3c-tests/inst.apk.py b/ivi/tct-typedarrays-nonw3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-typedarrays-nonw3c-tests/inst.apk.py
+++ b/ivi/tct-typedarrays-nonw3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-typedarrays-nonw3c-tests/inst.wgt.py b/ivi/tct-typedarrays-nonw3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-typedarrays-nonw3c-tests/inst.wgt.py
+++ b/ivi/tct-typedarrays-nonw3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-typedarrays-nonw3c-tests/inst.xpk.py b/ivi/tct-typedarrays-nonw3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-typedarrays-nonw3c-tests/inst.xpk.py
+++ b/ivi/tct-typedarrays-nonw3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-ui-css3-tests/inst.apk.py b/ivi/tct-ui-css3-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-ui-css3-tests/inst.apk.py
+++ b/ivi/tct-ui-css3-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-ui-css3-tests/inst.wgt.py b/ivi/tct-ui-css3-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-ui-css3-tests/inst.wgt.py
+++ b/ivi/tct-ui-css3-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-ui-css3-tests/inst.xpk.py b/ivi/tct-ui-css3-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-ui-css3-tests/inst.xpk.py
+++ b/ivi/tct-ui-css3-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-video-html5-tests/inst.apk.py b/ivi/tct-video-html5-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-video-html5-tests/inst.apk.py
+++ b/ivi/tct-video-html5-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-video-html5-tests/inst.wgt.py b/ivi/tct-video-html5-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-video-html5-tests/inst.wgt.py
+++ b/ivi/tct-video-html5-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-video-html5-tests/inst.xpk.py b/ivi/tct-video-html5-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-video-html5-tests/inst.xpk.py
+++ b/ivi/tct-video-html5-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webaudio-w3c-tests/inst.apk.py b/ivi/tct-webaudio-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-webaudio-w3c-tests/inst.apk.py
+++ b/ivi/tct-webaudio-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webaudio-w3c-tests/inst.wgt.py b/ivi/tct-webaudio-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-webaudio-w3c-tests/inst.wgt.py
+++ b/ivi/tct-webaudio-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webaudio-w3c-tests/inst.xpk.py b/ivi/tct-webaudio-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-webaudio-w3c-tests/inst.xpk.py
+++ b/ivi/tct-webaudio-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webdatabase-w3c-tests/inst.apk.py b/ivi/tct-webdatabase-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-webdatabase-w3c-tests/inst.apk.py
+++ b/ivi/tct-webdatabase-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webdatabase-w3c-tests/inst.wgt.py b/ivi/tct-webdatabase-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-webdatabase-w3c-tests/inst.wgt.py
+++ b/ivi/tct-webdatabase-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webdatabase-w3c-tests/inst.xpk.py b/ivi/tct-webdatabase-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-webdatabase-w3c-tests/inst.xpk.py
+++ b/ivi/tct-webdatabase-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webgl-nonw3c-tests/inst.apk.py b/ivi/tct-webgl-nonw3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-webgl-nonw3c-tests/inst.apk.py
+++ b/ivi/tct-webgl-nonw3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webgl-nonw3c-tests/inst.wgt.py b/ivi/tct-webgl-nonw3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-webgl-nonw3c-tests/inst.wgt.py
+++ b/ivi/tct-webgl-nonw3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webgl-nonw3c-tests/inst.xpk.py b/ivi/tct-webgl-nonw3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-webgl-nonw3c-tests/inst.xpk.py
+++ b/ivi/tct-webgl-nonw3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webmessaging-w3c-tests/inst.apk.py b/ivi/tct-webmessaging-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-webmessaging-w3c-tests/inst.apk.py
+++ b/ivi/tct-webmessaging-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webmessaging-w3c-tests/inst.wgt.py b/ivi/tct-webmessaging-w3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-webmessaging-w3c-tests/inst.wgt.py
+++ b/ivi/tct-webmessaging-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webmessaging-w3c-tests/inst.xpk.py b/ivi/tct-webmessaging-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-webmessaging-w3c-tests/inst.xpk.py
+++ b/ivi/tct-webmessaging-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websetting-tizen-tests/inst.apk.py b/ivi/tct-websetting-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-websetting-tizen-tests/inst.apk.py
+++ b/ivi/tct-websetting-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websetting-tizen-tests/inst.wgt.py b/ivi/tct-websetting-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-websetting-tizen-tests/inst.wgt.py
+++ b/ivi/tct-websetting-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websetting-tizen-tests/inst.xpk.py b/ivi/tct-websetting-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-websetting-tizen-tests/inst.xpk.py
+++ b/ivi/tct-websetting-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websocket-w3c-tests/inst.apk.py b/ivi/tct-websocket-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-websocket-w3c-tests/inst.apk.py
+++ b/ivi/tct-websocket-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websocket-w3c-tests/inst.wgt.py b/ivi/tct-websocket-w3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-websocket-w3c-tests/inst.wgt.py
+++ b/ivi/tct-websocket-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-websocket-w3c-tests/inst.xpk.py b/ivi/tct-websocket-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-websocket-w3c-tests/inst.xpk.py
+++ b/ivi/tct-websocket-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webstorage-w3c-tests/inst.apk.py b/ivi/tct-webstorage-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-webstorage-w3c-tests/inst.apk.py
+++ b/ivi/tct-webstorage-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webstorage-w3c-tests/inst.wgt.py b/ivi/tct-webstorage-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-webstorage-w3c-tests/inst.wgt.py
+++ b/ivi/tct-webstorage-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-webstorage-w3c-tests/inst.xpk.py b/ivi/tct-webstorage-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-webstorage-w3c-tests/inst.xpk.py
+++ b/ivi/tct-webstorage-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi01-w3c-tests/inst.apk.py b/ivi/tct-wgtapi01-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-wgtapi01-w3c-tests/inst.apk.py
+++ b/ivi/tct-wgtapi01-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi01-w3c-tests/inst.wgt.py b/ivi/tct-wgtapi01-w3c-tests/inst.wgt.py
index fedb04bebd23ce8e315d2eaad8073377c5275e18..5b9572769a2d8415a48c007050e151b1224d45e1 100755 (executable)
--- a/ivi/tct-wgtapi01-w3c-tests/inst.wgt.py
+++ b/ivi/tct-wgtapi01-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -170,8 +170,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -190,7 +190,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -200,10 +200,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi01-w3c-tests/inst.xpk.py b/ivi/tct-wgtapi01-w3c-tests/inst.xpk.py
index 8e14d7da571773e8a34f2b1d172a3d344c4a5ae5..60a188baa7d629a6723bc8102794f3f8c5a78509 100755 (executable)
--- a/ivi/tct-wgtapi01-w3c-tests/inst.xpk.py
+++ b/ivi/tct-wgtapi01-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -170,8 +170,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -190,7 +190,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -200,10 +200,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi02-w3c-tests/inst.apk.py b/ivi/tct-wgtapi02-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-wgtapi02-w3c-tests/inst.apk.py
+++ b/ivi/tct-wgtapi02-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi02-w3c-tests/inst.wgt.py b/ivi/tct-wgtapi02-w3c-tests/inst.wgt.py
index 43f110bcea820de3827a24812eed3f90c4dcd623..617c1f44c6211eb847c8384a9073bb65cbcc0df4 100755 (executable)
--- a/ivi/tct-wgtapi02-w3c-tests/inst.wgt.py
+++ b/ivi/tct-wgtapi02-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-wgtapi02-w3c-tests/inst.xpk.py b/ivi/tct-wgtapi02-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-wgtapi02-w3c-tests/inst.xpk.py
+++ b/ivi/tct-wgtapi02-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget01-w3c-tests/inst.apk.py b/ivi/tct-widget01-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-widget01-w3c-tests/inst.apk.py
+++ b/ivi/tct-widget01-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget01-w3c-tests/inst.wgt.py b/ivi/tct-widget01-w3c-tests/inst.wgt.py
index fedb04bebd23ce8e315d2eaad8073377c5275e18..5b9572769a2d8415a48c007050e151b1224d45e1 100755 (executable)
--- a/ivi/tct-widget01-w3c-tests/inst.wgt.py
+++ b/ivi/tct-widget01-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -170,8 +170,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -190,7 +190,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -200,10 +200,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget01-w3c-tests/inst.xpk.py b/ivi/tct-widget01-w3c-tests/inst.xpk.py
index 8e14d7da571773e8a34f2b1d172a3d344c4a5ae5..60a188baa7d629a6723bc8102794f3f8c5a78509 100755 (executable)
--- a/ivi/tct-widget01-w3c-tests/inst.xpk.py
+++ b/ivi/tct-widget01-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -170,8 +170,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -190,7 +190,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -200,10 +200,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget02-w3c-tests/inst.apk.py b/ivi/tct-widget02-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-widget02-w3c-tests/inst.apk.py
+++ b/ivi/tct-widget02-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget02-w3c-tests/inst.wgt.py b/ivi/tct-widget02-w3c-tests/inst.wgt.py
index 7574ae1d7b8dbaf56f0fea3eb2fed1199c5e5a1b..773707bb2217c7448bb4309b2764c04c57634501 100755 (executable)
--- a/ivi/tct-widget02-w3c-tests/inst.wgt.py
+++ b/ivi/tct-widget02-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widget02-w3c-tests/inst.xpk.py b/ivi/tct-widget02-w3c-tests/inst.xpk.py
index 6bc5749c3943808886390660f5bd85b27b752feb..88d4d47ed78756d710f20e61b4345d5b7ca04b5e 100755 (executable)
--- a/ivi/tct-widget02-w3c-tests/inst.xpk.py
+++ b/ivi/tct-widget02-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widgetpolicy-w3c-tests/inst.apk.py b/ivi/tct-widgetpolicy-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-widgetpolicy-w3c-tests/inst.apk.py
+++ b/ivi/tct-widgetpolicy-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widgetpolicy-w3c-tests/inst.wgt.py b/ivi/tct-widgetpolicy-w3c-tests/inst.wgt.py
index dc5c117506f838e31408c42393cef115ce2c8711..b7ded08577a191fe7737dffdb586ab186c4a3375 100755 (executable)
--- a/ivi/tct-widgetpolicy-w3c-tests/inst.wgt.py
+++ b/ivi/tct-widgetpolicy-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -172,8 +172,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -192,7 +192,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -202,10 +202,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-widgetpolicy-w3c-tests/inst.xpk.py b/ivi/tct-widgetpolicy-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-widgetpolicy-w3c-tests/inst.xpk.py
+++ b/ivi/tct-widgetpolicy-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-woff-w3c-tests/inst.apk.py b/ivi/tct-woff-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-woff-w3c-tests/inst.apk.py
+++ b/ivi/tct-woff-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-woff-w3c-tests/inst.wgt.py b/ivi/tct-woff-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-woff-w3c-tests/inst.wgt.py
+++ b/ivi/tct-woff-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-woff-w3c-tests/inst.xpk.py b/ivi/tct-woff-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-woff-w3c-tests/inst.xpk.py
+++ b/ivi/tct-woff-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-workers-w3c-tests/inst.apk.py b/ivi/tct-workers-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-workers-w3c-tests/inst.apk.py
+++ b/ivi/tct-workers-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-workers-w3c-tests/inst.wgt.py b/ivi/tct-workers-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/tct-workers-w3c-tests/inst.wgt.py
+++ b/ivi/tct-workers-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-workers-w3c-tests/inst.xpk.py b/ivi/tct-workers-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-workers-w3c-tests/inst.xpk.py
+++ b/ivi/tct-workers-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-xmlhttprequest-w3c-tests/inst.apk.py b/ivi/tct-xmlhttprequest-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/tct-xmlhttprequest-w3c-tests/inst.apk.py
+++ b/ivi/tct-xmlhttprequest-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-xmlhttprequest-w3c-tests/inst.wgt.py b/ivi/tct-xmlhttprequest-w3c-tests/inst.wgt.py
index db5440cb74b5cb5b72d6e9014f235f2343946008..8515a88b8b7254a19c263e387c11a4ce27b3ed1d 100755 (executable)
--- a/ivi/tct-xmlhttprequest-w3c-tests/inst.wgt.py
+++ b/ivi/tct-xmlhttprequest-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/tct-xmlhttprequest-w3c-tests/inst.xpk.py b/ivi/tct-xmlhttprequest-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/tct-xmlhttprequest-w3c-tests/inst.xpk.py
+++ b/ivi/tct-xmlhttprequest-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-hrtime-w3c-tests/inst.apk.py b/ivi/webapi-hrtime-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-hrtime-w3c-tests/inst.apk.py
+++ b/ivi/webapi-hrtime-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-hrtime-w3c-tests/inst.wgt.py b/ivi/webapi-hrtime-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-hrtime-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-hrtime-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-hrtime-w3c-tests/inst.xpk.py b/ivi/webapi-hrtime-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-hrtime-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-hrtime-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-nfc-w3c-tests/inst.apk.py b/ivi/webapi-nfc-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-nfc-w3c-tests/inst.apk.py
+++ b/ivi/webapi-nfc-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-nfc-w3c-tests/inst.wgt.py b/ivi/webapi-nfc-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-nfc-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-nfc-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-nfc-w3c-tests/inst.xpk.py b/ivi/webapi-nfc-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-nfc-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-nfc-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-performancetimeline-w3c-tests/inst.apk.py b/ivi/webapi-performancetimeline-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-performancetimeline-w3c-tests/inst.apk.py
+++ b/ivi/webapi-performancetimeline-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-performancetimeline-w3c-tests/inst.wgt.py b/ivi/webapi-performancetimeline-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-performancetimeline-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-performancetimeline-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-performancetimeline-w3c-tests/inst.xpk.py b/ivi/webapi-performancetimeline-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-performancetimeline-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-performancetimeline-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-resourcetiming-w3c-tests/inst.apk.py b/ivi/webapi-resourcetiming-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-resourcetiming-w3c-tests/inst.apk.py
+++ b/ivi/webapi-resourcetiming-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-resourcetiming-w3c-tests/inst.wgt.py b/ivi/webapi-resourcetiming-w3c-tests/inst.wgt.py
index eedbf88450cc4dffa05e99a2119b17a95b48ec76..929bf5c3fe48cb0eccb6ddcd0cef4dd1b66c124c 100755 (executable)
--- a/ivi/webapi-resourcetiming-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-resourcetiming-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -177,8 +177,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -197,7 +197,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -207,10 +207,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-resourcetiming-w3c-tests/inst.xpk.py b/ivi/webapi-resourcetiming-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-resourcetiming-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-resourcetiming-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-speechapi-tizen-tests/inst.apk.py b/ivi/webapi-speechapi-tizen-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-speechapi-tizen-tests/inst.apk.py
+++ b/ivi/webapi-speechapi-tizen-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-speechapi-tizen-tests/inst.wgt.py b/ivi/webapi-speechapi-tizen-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-speechapi-tizen-tests/inst.wgt.py
+++ b/ivi/webapi-speechapi-tizen-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-speechapi-tizen-tests/inst.xpk.py b/ivi/webapi-speechapi-tizen-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-speechapi-tizen-tests/inst.xpk.py
+++ b/ivi/webapi-speechapi-tizen-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-usertiming-w3c-tests/inst.apk.py b/ivi/webapi-usertiming-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-usertiming-w3c-tests/inst.apk.py
+++ b/ivi/webapi-usertiming-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-usertiming-w3c-tests/inst.wgt.py b/ivi/webapi-usertiming-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-usertiming-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-usertiming-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-usertiming-w3c-tests/inst.xpk.py b/ivi/webapi-usertiming-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-usertiming-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-usertiming-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-vehicleinfo-ivi-tests/inst.apk.py b/ivi/webapi-vehicleinfo-ivi-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-vehicleinfo-ivi-tests/inst.apk.py
+++ b/ivi/webapi-vehicleinfo-ivi-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-vehicleinfo-ivi-tests/inst.wgt.py b/ivi/webapi-vehicleinfo-ivi-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-vehicleinfo-ivi-tests/inst.wgt.py
+++ b/ivi/webapi-vehicleinfo-ivi-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-vehicleinfo-ivi-tests/inst.xpk.py b/ivi/webapi-vehicleinfo-ivi-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-vehicleinfo-ivi-tests/inst.xpk.py
+++ b/ivi/webapi-vehicleinfo-ivi-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-webrtc-w3c-tests/inst.apk.py b/ivi/webapi-webrtc-w3c-tests/inst.apk.py
index a13f660a9139880755ad26f3165b84b1efc8b760..5fcedb9d91f24fe5a9a5da8222042cef2d9f323b 100755 (executable)
--- a/ivi/webapi-webrtc-w3c-tests/inst.apk.py
+++ b/ivi/webapi-webrtc-w3c-tests/inst.apk.py
@@ -16,14 +16,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -76,8 +76,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -88,11 +88,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-webrtc-w3c-tests/inst.wgt.py b/ivi/webapi-webrtc-w3c-tests/inst.wgt.py
index 918e9561d42cd2e84992a3e2b6829c13ebb2d682..44eca3371ac3a23502ae256c563b99105c27202b 100755 (executable)
--- a/ivi/webapi-webrtc-w3c-tests/inst.wgt.py
+++ b/ivi/webapi-webrtc-w3c-tests/inst.wgt.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -178,8 +178,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -198,7 +198,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -208,10 +208,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/ivi/webapi-webrtc-w3c-tests/inst.xpk.py b/ivi/webapi-webrtc-w3c-tests/inst.xpk.py
index 62f961bb9e156b4c452bb601d8cd2804400dbb17..11cdd8e23af8dbb8ce8b028818ce97a39285f3c8 100755 (executable)
--- a/ivi/webapi-webrtc-w3c-tests/inst.xpk.py
+++ b/ivi/webapi-webrtc-w3c-tests/inst.xpk.py
@@ -20,14 +20,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -179,8 +179,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -199,7 +199,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -209,10 +209,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-capability-tests/inst.apk.py b/mobile/tct-capability-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/mobile/tct-capability-tests/inst.apk.py
+++ b/mobile/tct-capability-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-capability-tests/inst.wgt.py b/mobile/tct-capability-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/mobile/tct-capability-tests/inst.wgt.py
+++ b/mobile/tct-capability-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-capability-tests/inst.xpk.py b/mobile/tct-capability-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/mobile/tct-capability-tests/inst.xpk.py
+++ b/mobile/tct-capability-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-capability-tests/pack.py b/mobile/tct-capability-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/mobile/tct-capability-tests/pack.py
+++ b/mobile/tct-capability-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/mobile/tct-deprecatedapi-tizen-tests/inst.apk.py b/mobile/tct-deprecatedapi-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/mobile/tct-deprecatedapi-tizen-tests/inst.apk.py
+++ b/mobile/tct-deprecatedapi-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-deprecatedapi-tizen-tests/inst.wgt.py b/mobile/tct-deprecatedapi-tizen-tests/inst.wgt.py
index e32732b340da4841aa7a480e4c2e53dbd8f4b635..8e0d9ef1ac5649b442f894d42aea36e60df8bd95 100755 (executable)
--- a/mobile/tct-deprecatedapi-tizen-tests/inst.wgt.py
+++ b/mobile/tct-deprecatedapi-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-deprecatedapi-tizen-tests/inst.xpk.py b/mobile/tct-deprecatedapi-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/mobile/tct-deprecatedapi-tizen-tests/inst.xpk.py
+++ b/mobile/tct-deprecatedapi-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/mobile/tct-deprecatedapi-tizen-tests/pack.py b/mobile/tct-deprecatedapi-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/mobile/tct-deprecatedapi-tizen-tests/pack.py
+++ b/mobile/tct-deprecatedapi-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/tools/build/pack.py b/tools/build/pack.py
index e48cdc1748839ecd1b864814a8f96db9b166898c..22bf5e2a1c4f3f5593f9cc18f1af5ea2c927d073 100755 (executable)
--- a/tools/build/pack.py
+++ b/tools/build/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/tools/coverage/stats.py b/tools/coverage/stats.py
index e10865f470ba1f7cfcafcabfaaf5515f49fa6852..10a22ab09119901cdc3a6fe8d2977d7ccdd2d59f 100755 (executable)
--- a/tools/coverage/stats.py
+++ b/tools/coverage/stats.py
@@ -4,7 +4,7 @@
 import os
 import sys
 import re
-import commands
+import subprocess
 import glob
 import fnmatch
 import string
@@ -14,8 +14,8 @@ from optparse import OptionParser
 
 def iterfindfiles (path, fnexp):
     for root, dirs, files in os.walk(path):
-           for filename in fnmatch.filter(files, fnexp):
-                   yield os.path.join(root, filename)
+        for filename in fnmatch.filter(files, fnexp):
+            yield os.path.join(root, filename)
 
 def count_upstream (string = None, str_entry=None ):
     if string.find('/%s/' % str_entry) >= 0:
@@ -94,9 +94,9 @@ def analy_test_file(file_path = None):
                      p3_auto_webdriver += 1*subcase
                  else:
                    p3_manual += 1*subcase
-    except Exception, e:
-         print "Got error when analy test files: %s" % e
-         print file_path
+    except Exception as e:
+         print ("Got error when analy test files: %s" % e)
+         print (file_path)
 
     p0_number = p0_auto + p0_manual
     p1_number = p1_auto + p1_manual
@@ -125,8 +125,8 @@ def get_upstream(file_path):
                     n_upstream += 1
                     if element not in exist_upstream :
                        exist_upstream.append(element)
-    except Exception, e:
-        print e
+    except Exception as e:
+        print (e)
 
     upstream = ""
     for element in exist_upstream:
@@ -151,8 +151,8 @@ def get_case_status(file_path):
         fp.write(content)
         fp.write("\n")
         fp.close()
-    except Exception, e:
-        print "Got error when get case status: %s" % e
+    except Exception as e:
+        print ("Got error when get case status: %s" % e)
 
 def init_result_file():
     title = "Suite_name,Total,Total_auto,Total_auto_webdriver,Total_manual,P0,P0_auto,P0_auto_webdriver,P0_manual,P1,P1_auto,\
@@ -166,8 +166,8 @@ Integrated_Upstream_TCs,Upstream_Resource"
         fp.write(title)
         fp.write("\n")
         fp.close()
-    except Exception, e:
-        print "Got error when init analy file : %s" % e
+    except Exception as e:
+        print ("Got error when init analy file : %s" % e)
 
 def main():
     try:
@@ -184,7 +184,7 @@ def main():
         
         init_result_file()
         if len(sys.argv) == 1:
-                   sys.argv.append("-h")
+            sys.argv.append("-h")
         (PARAMETERS, args) = opts_parser.parse_args()
         if PARAMETERS.suitesdir:
             for filename in iterfindfiles("%s" % PARAMETERS.suitesdir, "tests.full.xml"):
@@ -193,8 +193,8 @@ def main():
         if PARAMETERS.xmlfile:
             get_case_status(PARAMETERS.xmlfile)   
     except Exception as e:
-        print "Got error: %s, exit" % e
+        print ("Got error: %s, exit" % e)
 
 if __name__ == '__main__':
-       main()
+    main()
 

diff --git a/tools/xml/csv2xml.py b/tools/xml/csv2xml.py
index 4447e4d65a1c8aad0bdcd5ad43cef5e355f01198..bdfdb207da941214883b6589d44165ec1c074c58 100755 (executable)
--- a/tools/xml/csv2xml.py
+++ b/tools/xml/csv2xml.py
@@ -65,11 +65,11 @@ class ColorFormatter(logging.Formatter):
 
 def csv2full(csv_path, split_sign):
     if not os.path.isfile(csv_path):
-        print '%s is not a file' % csv_path
+        print ('%s is not a file' % csv_path)
         return
     name, ext = os.path.splitext(csv_path)
     if not ext == '.csv':
-        print '%s is not a csv' % csv_path
+        print ('%s is not a csv' % csv_path)
         return
     LOG.info("+Convert csv to xml start ...")
     csv_file = file(csv_path, 'rb')
@@ -139,7 +139,7 @@ def echo_about():
     This function will print the user guide and stop toolkit.
     """
     about = 'csv2xml V1.0\n-c <path>  |  Convert csv file to tests.full.xml and tests.xml\n'
-    print about
+    print (about)
     sys.exit()
 
 def main():
@@ -161,7 +161,7 @@ def main():
     elif sys_name == 'Linux':
         split_sign = '/'
     if len(sys.argv) != 3:
-        print 'Error: No enough argv!'
+        print ('Error: No enough argv!')
         echo_about()
     else:
         {'-c': lambda : csv2full(sys.argv[2], split_sign)}[sys.argv[1]]()

diff --git a/tools/xml/xml2csv.py b/tools/xml/xml2csv.py
index 07de9c35a9f99b2a33bb37a7717b195a1a43c866..5a6d3ba2c28df90f33a7d062a8f3a93db6bcd993 100755 (executable)
--- a/tools/xml/xml2csv.py
+++ b/tools/xml/xml2csv.py
@@ -65,16 +65,16 @@ class ColorFormatter(logging.Formatter):
 
 def xml2csv(xml_path, split_sign):
     if not os.path.isfile(xml_path):
-        print '%s is not a file' % xml_path
+        print ('%s is not a file' % xml_path)
         return
     name, ext = os.path.splitext(xml_path)
 
     if not ext == '.xml':
-        print '%s is not a xml' % xml_path
+        print ('%s is not a xml' % xml_path)
         return
     if not name.split(split_sign)[-1] == 'tests.full':
-        print name
-        print '%s is not tests.full.xml' % xml_path
+        print (name)
+        print ('%s is not tests.full.xml' % xml_path)
         return
     LOG.info("+Convert xml to csv start ...")
     folder = os.path.dirname(xml_path)
@@ -152,7 +152,7 @@ def echo_about():
     This function will print the user guide and stop toolkit.
     """
     about = 'xml2csv V1.0\n-c <path>  |  Convert tests.full.xml to csv file\n'
-    print about
+    print (about)
     sys.exit()
 
 def main():
@@ -174,7 +174,7 @@ def main():
     elif sys_name == 'Linux':
         split_sign = '/'
     if len(sys.argv) != 3:
-        print 'Error: No enough argv!'
+        print ('Error: No enough argv!')
         echo_about()
     else:
         {

diff --git a/tools/xml/xmlverifier.py b/tools/xml/xmlverifier.py
index 4165ec9d6951df855f42197c477363fc8089a2ec..9794b2c8b1725646a07c9452a38811a926ac327b 100755 (executable)
--- a/tools/xml/xmlverifier.py
+++ b/tools/xml/xmlverifier.py
@@ -72,7 +72,7 @@ def verify_xml(xml_dir, split_sign):
         else:
             name, ext = os.path.splitext(xml_dir)
             if not ext == '.xml':
-                print '%s is not a xml' % xml_path
+                print ('%s is not a xml' % xml_path)
                 return
             else:
                 verify_path(xml_dir, split_sign)
@@ -143,7 +143,7 @@ def echo_about():
     This function will print the user guide and stop toolkit.
     """
     about = 'xmlverifier V1.0\n-v <path>  |  Verify case path, id, purpose and set type are right\n'
-    print about
+    print (about)
     sys.exit()
 
 def main():
@@ -165,7 +165,7 @@ def main():
     elif sys_name == 'Linux':
         split_sign = '/'
     if len(sys.argv) != 3:
-        print 'Error: No enough argv!'
+        print ('Error: No enough argv!')
         echo_about()
     else:
         {'-v': lambda : verify_xml(sys.argv[2], split_sign)}[sys.argv[1]]()

diff --git a/tv/tct-capability-tests/inst.apk.py b/tv/tct-capability-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/tv/tct-capability-tests/inst.apk.py
+++ b/tv/tct-capability-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-capability-tests/inst.wgt.py b/tv/tct-capability-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/tv/tct-capability-tests/inst.wgt.py
+++ b/tv/tct-capability-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-capability-tests/inst.xpk.py b/tv/tct-capability-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/tv/tct-capability-tests/inst.xpk.py
+++ b/tv/tct-capability-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-capability-tests/pack.py b/tv/tct-capability-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/tv/tct-capability-tests/pack.py
+++ b/tv/tct-capability-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/tv/tct-deprecatedapi-tizen-tests/inst.apk.py b/tv/tct-deprecatedapi-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..d636bee034d8504fbfee33e3d6fe297f4e9bee1a 100755 (executable)
--- a/tv/tct-deprecatedapi-tizen-tests/inst.apk.py
+++ b/tv/tct-deprecatedapi-tizen-tests/inst.apk.py
@@ -6,8 +6,8 @@ import glob
 import time
 import sys
 import subprocess
-from optparse import OptionParser, make_option\r
-import ConfigParser
+from optparse import OptionParser, make_option
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-deprecatedapi-tizen-tests/inst.wgt.py b/tv/tct-deprecatedapi-tizen-tests/inst.wgt.py
index e32732b340da4841aa7a480e4c2e53dbd8f4b635..8e0d9ef1ac5649b442f894d42aea36e60df8bd95 100755 (executable)
--- a/tv/tct-deprecatedapi-tizen-tests/inst.wgt.py
+++ b/tv/tct-deprecatedapi-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-deprecatedapi-tizen-tests/inst.xpk.py b/tv/tct-deprecatedapi-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/tv/tct-deprecatedapi-tizen-tests/inst.xpk.py
+++ b/tv/tct-deprecatedapi-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/tv/tct-deprecatedapi-tizen-tests/pack.py b/tv/tct-deprecatedapi-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/tv/tct-deprecatedapi-tizen-tests/pack.py
+++ b/tv/tct-deprecatedapi-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/wearable/tct-capability-tests/inst.apk.py b/wearable/tct-capability-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/wearable/tct-capability-tests/inst.apk.py
+++ b/wearable/tct-capability-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-capability-tests/inst.wgt.py b/wearable/tct-capability-tests/inst.wgt.py
index ef38eb600f18f1c170e0054cddaf87319822cc58..6e0726097c3b3cf38821ce5ab9232b33f5fdbf78 100755 (executable)
--- a/wearable/tct-capability-tests/inst.wgt.py
+++ b/wearable/tct-capability-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -37,7 +37,7 @@ def askpolicyremoving():
             if file.endswith(".wgt"):
                 pkg_id = getPKGID(os.path.basename(os.path.splitext(file)[0]))
    
-    print pkg_id
+    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)):
@@ -49,14 +49,14 @@ def askpolicyremoving():
        
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -205,8 +205,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -225,7 +225,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     userCheck()
@@ -237,10 +237,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-capability-tests/inst.xpk.py b/wearable/tct-capability-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/wearable/tct-capability-tests/inst.xpk.py
+++ b/wearable/tct-capability-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-capability-tests/pack.py b/wearable/tct-capability-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/wearable/tct-capability-tests/pack.py
+++ b/wearable/tct-capability-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir:

diff --git a/wearable/tct-deprecatedapi-tizen-tests/inst.apk.py b/wearable/tct-deprecatedapi-tizen-tests/inst.apk.py
index 31210db162ff0d25d19c69d63e5de2a6f552b4e7..997d98f378383bf25adb2e29457b44aa19b30eae 100755 (executable)
--- a/wearable/tct-deprecatedapi-tizen-tests/inst.apk.py
+++ b/wearable/tct-deprecatedapi-tizen-tests/inst.apk.py
@@ -7,7 +7,7 @@ import time
 import sys
 import subprocess
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -17,14 +17,14 @@ ADB_CMD = "adb"
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -77,8 +77,8 @@ def main():
             "-u", dest="buninstpkg", action="store_true", help="Uninstall package")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.device:
@@ -89,11 +89,11 @@ def main():
                 break
 
     if not PARAMETERS.device:
-        print "No device found"
+        print ("No device found")
         sys.exit(1)
 
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-deprecatedapi-tizen-tests/inst.wgt.py b/wearable/tct-deprecatedapi-tizen-tests/inst.wgt.py
index e32732b340da4841aa7a480e4c2e53dbd8f4b635..8e0d9ef1ac5649b442f894d42aea36e60df8bd95 100755 (executable)
--- a/wearable/tct-deprecatedapi-tizen-tests/inst.wgt.py
+++ b/wearable/tct-deprecatedapi-tizen-tests/inst.wgt.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -33,14 +33,14 @@ def userCheck():
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -188,8 +188,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -208,7 +208,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
     
     userCheck()
@@ -220,10 +220,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-deprecatedapi-tizen-tests/inst.xpk.py b/wearable/tct-deprecatedapi-tizen-tests/inst.xpk.py
index 211d24c73b20b5b3e5025847a9233ca625463653..dccbae7e9daa70697cf0b02269113bd01d963945 100755 (executable)
--- a/wearable/tct-deprecatedapi-tizen-tests/inst.xpk.py
+++ b/wearable/tct-deprecatedapi-tizen-tests/inst.xpk.py
@@ -8,7 +8,7 @@ import sys
 import subprocess
 import string
 from optparse import OptionParser, make_option\r
-import ConfigParser
+import configparser
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -16,7 +16,7 @@ PKG_NAME = os.path.basename(SCRIPT_DIR)
 PARAMETERS = None
 #XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/5000/dbus/user_bus_socket"
 TCT_CONFIG_FILE = "/opt/tools/TCT_CONFIG"
-tct_parser = ConfigParser.ConfigParser()
+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)
@@ -24,14 +24,14 @@ PKG_SRC_DIR = "%s/tct/opt/%s" % (SRC_DIR, PKG_NAME)
 
 def doCMD(cmd):
     # Do not need handle timeout in this short script, let tool do it
-    print "-->> \"%s\"" % cmd
+    print ("-->> \"%s\"" % cmd)
     output = []
     cmd_return_code = 1
     cmd_proc = subprocess.Popen(
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         if output_line == '' and cmd_return_code != None:
             break
@@ -183,8 +183,8 @@ def main():
             "-a", dest="user", action="store", help="User name")
         global PARAMETERS
         (PARAMETERS, args) = opts_parser.parse_args()
-    except Exception, e:
-        print "Got wrong option: %s, exit ..." % e
+    except Exception as e:
+        print ("Got wrong option: %s, exit ..." % e)
         sys.exit(1)
 
     if not PARAMETERS.user:
@@ -203,7 +203,7 @@ def main():
         PARAMETERS.mode = "SSH"
 
     if not PARAMETERS.device:
-        print "No device provided"
+        print ("No device provided")
         sys.exit(1)
 
     user_info = getUSERID()
@@ -213,10 +213,10 @@ def main():
         userid = user_info[1][0]
         XW_ENV = "export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%s/dbus/user_bus_socket"%str(userid)
     else:
-        print "[Error] cmd commands error : %s"%str(user_info[1])
+        print ("[Error] cmd commands error : %s" % str(user_info[1]))
         sys.exit(1)
     if PARAMETERS.binstpkg and PARAMETERS.buninstpkg:
-        print "-i and -u are conflict"
+        print ("-i and -u are conflict")
         sys.exit(1)
 
     if PARAMETERS.buninstpkg:

diff --git a/wearable/tct-deprecatedapi-tizen-tests/pack.py b/wearable/tct-deprecatedapi-tizen-tests/pack.py
index e29187a0bae2e2dce107adc8fe9ecb8898559397..f1f0cb470fad677077cced4db9cf44015525827c 100755 (executable)
--- a/wearable/tct-deprecatedapi-tizen-tests/pack.py
+++ b/wearable/tct-deprecatedapi-tizen-tests/pack.py
@@ -40,10 +40,10 @@ import logging
 import zipfile
 import signal
 import subprocess
+import imp
 from optparse import OptionParser
 
-reload(sys)
-sys.setdefaultencoding('utf8')
+imp.reload(sys)
 
 TOOL_VERSION = "v0.1"
 VERSION_FILE = "VERSION"
@@ -363,7 +363,7 @@ def doCMDWithOutput(cmd, time_out=DEFAULT_CMD_TIMEOUT):
         cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
 
     while True:
-        output_line = cmd_proc.stdout.readline().strip("\r\n")
+        output_line = cmd_proc.stdout.readline().decode("UTF-8").strip("\r\n")
         cmd_return_code = cmd_proc.poll()
         elapsed_time = time.time() - pre_time
         if cmd_return_code is None:
@@ -938,7 +938,7 @@ def main():
         sys.exit(1)
 
     if BUILD_PARAMETERS.bversion:
-        print "Version: %s" % TOOL_VERSION
+        LOG.info("Version: %s" % TOOL_VERSION)
         sys.exit(0)
 
     if not BUILD_PARAMETERS.srcdir: