Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
YottaChain
YTBP
提交
3df60605
Y
YTBP
项目概览
YottaChain
/
YTBP
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
YTBP
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3df60605
编写于
9月 06, 2018
作者:
B
Brian Johnson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added exception handling around testUtils.checkOutput. GH #5199
上级
94d08370
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
7 deletion
+30
-7
tests/Cluster.py
tests/Cluster.py
+4
-2
tests/WalletMgr.py
tests/WalletMgr.py
+26
-5
未找到文件。
tests/Cluster.py
浏览文件 @
3df60605
...
...
@@ -1064,8 +1064,10 @@ class Cluster(object):
if
Utils
.
Debug
:
Utils
.
Print
(
"cmd: %s"
%
(
cmd
))
psOut
=
Utils
.
checkOutput
(
cmd
.
split
())
return
psOut
except
subprocess
.
CalledProcessError
as
_
:
pass
except
subprocess
.
CalledProcessError
as
ex
:
msg
=
ex
.
output
.
decode
(
"utf-8"
)
Utils
.
Print
(
"ERROR: call of
\"
%s
\"
failed. %s"
%
(
cmd
,
msg
))
return
None
return
None
psOut
=
Utils
.
waitForObj
(
myFunc
,
timeout
)
...
...
tests/WalletMgr.py
浏览文件 @
3df60605
...
...
@@ -55,7 +55,17 @@ class WalletMgr(object):
p
=
re
.
compile
(
r
'\n\"(\w+)\"\n'
,
re
.
MULTILINE
)
cmd
=
"%s %s wallet create --name %s --to-console"
%
(
Utils
.
EosClientPath
,
self
.
endpointArgs
,
name
)
if
Utils
.
Debug
:
Utils
.
Print
(
"cmd: %s"
%
(
cmd
))
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
retStr
=
None
try
:
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
except
subprocess
.
CalledProcessError
as
ex
:
msg
=
ex
.
output
.
decode
(
"utf-8"
)
msg
=
"ERROR: Failed to import account owner key %s. %s"
%
(
account
.
ownerPrivateKey
,
msg
)
if
exitOnError
:
Utils
.
errorExit
(
"%s"
%
(
msg
))
Utils
.
Print
(
"%s"
%
(
msg
))
return
None
#Utils.Print("create: %s" % (retStr))
m
=
p
.
search
(
retStr
)
if
m
is
None
:
...
...
@@ -152,8 +162,14 @@ class WalletMgr(object):
p
=
re
.
compile
(
r
'\s+\"(\w+)\s\*\",?\n'
,
re
.
MULTILINE
)
cmd
=
"%s %s wallet list"
%
(
Utils
.
EosClientPath
,
self
.
endpointArgs
)
if
Utils
.
Debug
:
Utils
.
Print
(
"cmd: %s"
%
(
cmd
))
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
#Utils.Print("retStr: %s" % (retStr))
retStr
=
None
try
:
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
except
subprocess
.
CalledProcessError
as
ex
:
msg
=
ex
.
output
.
decode
(
"utf-8"
)
Utils
.
Print
(
"ERROR: Failed to open wallets. %s"
%
(
msg
))
return
False
m
=
p
.
findall
(
retStr
)
if
m
is
None
:
Utils
.
Print
(
"ERROR: wallet list parser failure"
)
...
...
@@ -168,8 +184,13 @@ class WalletMgr(object):
p
=
re
.
compile
(
r
'\n\s+\"(\w+)\"\n'
,
re
.
MULTILINE
)
cmd
=
"%s %s wallet private_keys --name %s --password %s "
%
(
Utils
.
EosClientPath
,
self
.
endpointArgs
,
wallet
.
name
,
wallet
.
password
)
if
Utils
.
Debug
:
Utils
.
Print
(
"cmd: %s"
%
(
cmd
))
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
#Utils.Print("retStr: %s" % (retStr))
retStr
=
None
try
:
retStr
=
Utils
.
checkOutput
(
cmd
.
split
())
except
subprocess
.
CalledProcessError
as
ex
:
msg
=
ex
.
output
.
decode
(
"utf-8"
)
Utils
.
Print
(
"ERROR: Failed to get keys. %s"
%
(
msg
))
return
False
m
=
p
.
findall
(
retStr
)
if
m
is
None
:
Utils
.
Print
(
"ERROR: wallet private_keys parser failure"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录