Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
21daadbd
T
tp-qemu
项目概览
openeuler
/
tp-qemu
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tp-qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
21daadbd
编写于
9月 11, 2018
作者:
Q
Qianqian Zhu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virtio_console: python3 issue fix
Signed-off-by:
N
Qianqian Zhu
<
qizhu@redhat.com
>
上级
48ad741d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
11 deletion
+11
-11
qemu/tests/chardev_hotplug.py
qemu/tests/chardev_hotplug.py
+1
-1
qemu/tests/virtio_console.py
qemu/tests/virtio_console.py
+10
-10
未找到文件。
qemu/tests/chardev_hotplug.py
浏览文件 @
21daadbd
...
...
@@ -113,7 +113,7 @@ def run(test, params, env):
logging
.
info
(
"host pty device is '%s'"
%
filename
)
fd_dst
=
os
.
open
(
filename
,
os
.
O_RDWR
|
os
.
O_NONBLOCK
)
chardev_use
(
vm
,
"chardev-pty"
)
output
=
os
.
read
(
fd_dst
,
256
)
output
=
os
.
read
(
fd_dst
,
256
)
.
decode
()
os
.
close
(
fd_dst
)
if
output
.
find
(
"Hello virttest world"
)
==
-
1
:
test
.
fail
(
"Guest message not found [%s]"
%
output
)
...
...
qemu/tests/virtio_console.py
浏览文件 @
21daadbd
...
...
@@ -130,7 +130,7 @@ def run(test, params, env):
2
)
# Poll (IN, OUT)
port
.
sock
.
sendall
(
"test"
)
port
.
sock
.
sendall
(
b
"test"
)
for
test
in
[
select
.
POLLIN
,
select
.
POLLOUT
]:
guest_worker
.
cmd
(
"virt.poll('%s', %s)"
%
(
port
.
name
,
test
),
10
)
...
...
@@ -179,7 +179,7 @@ def run(test, params, env):
# Test sigio when port receive data
guest_worker
.
cmd
(
"virt.set_pool_want_return('%s', select.POLLOUT |"
" select.POLLIN)"
%
(
port
.
name
),
10
)
port
.
sock
.
sendall
(
"0123456789"
)
port
.
sock
.
sendall
(
b
"0123456789"
)
guest_worker
.
cmd
(
"virt.get_sigio_poll_return('%s')"
%
(
port
.
name
),
10
)
# Test sigio port close event
...
...
@@ -299,7 +299,7 @@ def run(test, params, env):
"Data:
\n
%s"
%
tmp
)
elif
match
is
not
None
:
test
.
fail
(
"Unexpected fail
\n
Match: %s
\n
Data:
\n
%s"
%
(
match
,
tmp
))
port
.
sock
.
sendall
(
"1234567890"
)
port
.
sock
.
sendall
(
b
"1234567890"
)
# Now guest received the data end escaped from the recv()
guest_worker
.
cmd
(
"print('PASS: nothing')"
,
10
)
virtio_test
.
cleanup
(
vm
,
guest_worker
)
...
...
@@ -326,7 +326,7 @@ def run(test, params, env):
"Data:
\n
%s"
%
tmp
)
elif
match
!=
1
:
test
.
fail
(
"Unexpected fail
\n
Match: %s
\n
Data:
\n
%s"
%
(
match
,
tmp
))
port
.
sock
.
sendall
(
"1234567890"
)
port
.
sock
.
sendall
(
b
"1234567890"
)
time
.
sleep
(
0.01
)
try
:
guest_worker
.
cmd
(
"virt.recv('%s', 10, 1024, False)"
...
...
@@ -354,7 +354,7 @@ def run(test, params, env):
vm
,
guest_worker
=
virtio_test
.
get_vm_with_worker
(
no_consoles
=
2
)
send_port
,
recv_port
=
virtio_test
.
get_virtio_ports
(
vm
)[
0
][:
2
]
data
=
"Smoke test data"
data
=
b
"Smoke test data"
send_port
.
open
()
recv_port
.
open
()
# Set nonblocking mode
...
...
@@ -363,7 +363,7 @@ def run(test, params, env):
guest_worker
.
cmd
(
"virt.loopback(['%s'], ['%s'], 1024, virt.LOOP_NONE)"
%
(
send_port
.
name
,
recv_port
.
name
),
10
)
send_port
.
sock
.
sendall
(
data
)
tmp
=
""
tmp
=
b
""
i
=
0
while
i
<=
10
:
i
+=
1
...
...
@@ -983,9 +983,9 @@ def run(test, params, env):
port
.
open
()
data
=
""
data
=
b
""
for
_
in
range
(
buf_len
):
data
+=
"%c"
%
random
.
randrange
(
255
)
data
+=
b
"%c"
%
random
.
randrange
(
255
)
funcatexit
.
register
(
env
,
params
.
get
(
'type'
),
__set_exit_event
)
...
...
@@ -1592,7 +1592,7 @@ def run(test, params, env):
try
:
sent1
=
0
for
_
in
range
(
1000000
):
sent1
+=
port
.
sock
.
send
(
"a"
)
sent1
+=
port
.
sock
.
send
(
b
"a"
)
except
socket
.
timeout
:
logging
.
info
(
"Data sending to closed port timed out."
)
...
...
@@ -1609,7 +1609,7 @@ def run(test, params, env):
try
:
sent2
=
0
for
_
in
range
(
40000
):
sent2
=
port
.
sock
.
send
(
"a"
)
sent2
=
port
.
sock
.
send
(
b
"a"
)
except
socket
.
timeout
:
logging
.
info
(
"Data sending to closed port timed out."
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录