提交 48eb9c2f 编写于 作者: C Ciju John

testUtils uses Python 3.5 API. Updating scripts and travis build to include it.

上级 336b0ecd
......@@ -19,7 +19,7 @@ matrix:
- ninja-build
- libgmp-dev
- libclang-4.0-dev
- python3
- python3.5
- os: osx
osx_image: xcode9.1
before_install:
......
#!/usr/bin/python3
#!/usr/bin/python3.5
import testUtils
......
#!/usr/bin/python3
#!/usr/bin/python3.5
import testUtils
......
#!/usr/bin/python3
#!/usr/bin/python3.5
import testUtils
......
......@@ -16,6 +16,10 @@ import random
import io
import json
if sys.version_info[0] != 3 or sys.version_info[1] < 5:
print("ERROR: This script requires Python version 3.5")
sys.exit(1)
###########################################################################################
class Utils:
Debug=False
......@@ -600,7 +604,6 @@ class WalletMgr(object):
Utils.EosClientPath, self.endpointArgs, wallet.name, account.ownerPrivateKey)
Utils.Debug and Utils.Print("cmd: %s" % (cmd))
try:
#trans=Node.runCmdReturnJson(cmd, True)
retStr=subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT).decode("utf-8")
except subprocess.CalledProcessError as ex:
msg=ex.output.decode("utf-8")
......@@ -617,7 +620,6 @@ class WalletMgr(object):
Utils.EosClientPath, self.endpointArgs, wallet.name, account.activePrivateKey)
Utils.Debug and Utils.Print("cmd: %s" % (cmd))
try:
#trans=Node.runCmdReturnJson(cmd)
retStr=subprocess.check_output(cmd.split(), stderr=subprocess.STDOUT).decode("utf-8")
except subprocess.CalledProcessError as ex:
msg=ex.output.decode("utf-8")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册