From: zhongyuan Date: Fri, 19 Jul 2019 06:36:26 +0000 (+0800) Subject: [common][workers][DPTTIZEN-3133, fix 1 tc issue for M69 upgrade] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d58d7713a4cd22d5b2653b3246180a95b3e6156;p=test%2Ftct%2Fweb%2Fapi.git [common][workers][DPTTIZEN-3133, fix 1 tc issue for M69 upgrade] Change-Id: I8bcda154f4a78bf6cc6543841f4944cd8889805b --- diff --git a/common/tct-workers-w3c-tests/inst.wgt.py b/common/tct-workers-w3c-tests/inst.wgt.py index 44e57cf17..225affe5a 100755 --- a/common/tct-workers-w3c-tests/inst.wgt.py +++ b/common/tct-workers-w3c-tests/inst.wgt.py @@ -7,7 +7,7 @@ import time import sys import subprocess import string -from optparse import OptionParser, make_option +from optparse import OptionParser, make_option import ConfigParser @@ -161,16 +161,16 @@ def instPKGs(): 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 - ''' + 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 diff --git a/common/tct-workers-w3c-tests/suite.json b/common/tct-workers-w3c-tests/suite.json index cd5f0b2eb..080397e91 100755 --- a/common/tct-workers-w3c-tests/suite.json +++ b/common/tct-workers-w3c-tests/suite.json @@ -20,24 +20,25 @@ "tests.full.xml": "tests.full.xml", "tests.xml": "tests.xml" }, - "pkg-app": { - "sign-flag": "true" + "pkg-app": { + "sign-flag": "true", + "hosted-app": "true" } }, "apk-aio, cordova-aio": { "blacklist": [] }, "wgt": { - "blacklist": [ - "*" - ], + "blacklist": [], "copylist": { "inst.wgt.py": "inst.py", "tests.full.xml": "tests.full.xml", "tests.xml": "tests.xml" }, - "pkg-app": { - "sign-flag": "true" + "pkg-app": { + "blacklist": [], + "sign-flag": "true", + "hosted-app": "true" } }, "xpk": { @@ -51,7 +52,8 @@ }, "pkg-app": { "blacklist": [], - "sign-flag": "true" + "sign-flag": "true", + "hosted-app": "true" } } },