From 6b48eb6801ac0cf7b5f7f87c2badb1a1a1e629ec Mon Sep 17 00:00:00 2001 From: Sanghoon Lee Date: Mon, 16 Apr 2018 19:33:18 +0900 Subject: [PATCH] [Tool][Non-ACR][Updated tct-shell] Change-Id: I5b1f9ff37d90ced3eee9ee709d54b0842631c750 --- .../tct-tools_r4_rc1/shell/tctshell/sdbmanager.py | 12 ++++++++++++ .../testkitlite2.0/testkitlite/util/httprequest.py | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/shell/tctshell/sdbmanager.py b/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/shell/tctshell/sdbmanager.py index de2274f..0a10c1f 100755 --- a/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/shell/tctshell/sdbmanager.py +++ b/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/shell/tctshell/sdbmanager.py @@ -358,6 +358,18 @@ class SdbManager: if isExist: if not os.path.exists(_resultDir): os.makedirs(_resultDir) + chk_crash_mgr_cmd = "ps -ef | grep -v grep | grep crash-manager" + while True: + outs = SdbManager.sdbShell(_devid, chk_crash_mgr_cmd) + if outs is None: + break + else: + wait_time = 10 + for loop in range(wait_time): + LOGGER.info("Waiting for crash-manager {0}...".\ + format(wait_time - loop)) + time.sleep(1) + remote = dumpPath res = SdbManager.sdbPull(_devid, remote, _resultDir) if res: diff --git a/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/testkitlite2.0/testkitlite/util/httprequest.py b/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/testkitlite2.0/testkitlite/util/httprequest.py index 0fe557b..b5996c1 100755 --- a/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/testkitlite2.0/testkitlite/util/httprequest.py +++ b/release/csharp-tct_5.0_dotnet/tct-tools_r4_rc1/testkitlite2.0/testkitlite/util/httprequest.py @@ -31,7 +31,7 @@ def get_url(baseurl, api): return "%s%s" % (baseurl, api) -def http_request(url, rtype="POST", data=None, time_out=10): +def http_request(url, rtype="POST", data=None, time_out=30): """ http request to the device http server """ @@ -45,6 +45,7 @@ def http_request(url, rtype="POST", data=None, time_out=10): if ret: result = ret.json() except Exception as error: + LOGGER.error(str(error)) pass elif rtype == "GET": try: @@ -52,5 +53,6 @@ def http_request(url, rtype="POST", data=None, time_out=10): if ret: result = ret.json() except Exception as error: + LOGGER.error(str(error)) pass return result -- 2.7.4