Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
ede41d4d
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,发现更多精彩内容 >>
未验证
提交
ede41d4d
编写于
10月 16, 2018
作者:
Q
Qianqian Zhu
提交者:
GitHub
10月 16, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1227 from huangyum/balloon_1517601
balloon_boot_in_pause: Fix login error since vm boot in pause status
上级
e1713faf
d5a9a630
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
20 deletion
+19
-20
qemu/tests/balloon_boot_in_pause.py
qemu/tests/balloon_boot_in_pause.py
+7
-9
qemu/tests/balloon_check.py
qemu/tests/balloon_check.py
+12
-11
未找到文件。
qemu/tests/balloon_boot_in_pause.py
浏览文件 @
ede41d4d
...
@@ -46,7 +46,7 @@ class BallooningTestPause(BallooningTest):
...
@@ -46,7 +46,7 @@ class BallooningTestPause(BallooningTest):
abs
(
gmem
-
self
.
old_gmem
)
-
changed_mem
)
>
100
):
abs
(
gmem
-
self
.
old_gmem
)
-
changed_mem
)
>
100
):
self
.
error_report
(
step
,
abs
(
self
.
old_mmem
-
changed_mem
),
self
.
error_report
(
step
,
abs
(
self
.
old_mmem
-
changed_mem
),
mmem
,
gmem
)
mmem
,
gmem
)
raise
exceptions
.
TestF
ail
(
"Balloon test failed %s"
%
step
)
self
.
test
.
f
ail
(
"Balloon test failed %s"
%
step
)
return
(
mmem
,
gmem
)
return
(
mmem
,
gmem
)
@
error_context
.
context_aware
@
error_context
.
context_aware
...
@@ -64,24 +64,22 @@ class BallooningTestPause(BallooningTest):
...
@@ -64,24 +64,22 @@ class BallooningTestPause(BallooningTest):
if
self
.
vm
.
monitor
.
verify_status
(
'paused'
):
if
self
.
vm
.
monitor
.
verify_status
(
'paused'
):
# Make sure memory not changed before the guest resumed
# Make sure memory not changed before the guest resumed
if
self
.
get_ballooned_memory
()
!=
self
.
ori_mem
:
if
self
.
get_ballooned_memory
()
!=
self
.
ori_mem
:
raise
exceptions
.
TestFail
(
"Memory changed before guest "
self
.
test
.
fail
(
"Memory changed before guest resumed"
)
"resumed"
)
logging
.
info
(
"Resume the guest"
)
logging
.
info
(
"Resume the guest"
)
self
.
vm
.
resume
()
self
.
vm
.
resume
()
elif
new_mem
==
self
.
get_ballooned_memory
():
elif
new_mem
==
self
.
get_ballooned_memory
():
pass
pass
else
:
else
:
raise
exceptions
.
TestFail
(
"Balloon memory fail with error"
self
.
test
.
fail
(
"Balloon memory fail with error message:%s"
%
e
)
" message: %s"
%
e
)
compare_mem
=
new_mem
compare_mem
=
new_mem
balloon_timeout
=
float
(
self
.
params
.
get
(
"balloon_timeout"
,
240
))
balloon_timeout
=
float
(
self
.
params
.
get
(
"balloon_timeout"
,
240
))
status
=
utils_misc
.
wait_for
((
lambda
:
compare_mem
==
status
=
utils_misc
.
wait_for
((
lambda
:
compare_mem
==
self
.
get_ballooned_memory
()),
self
.
get_ballooned_memory
()),
balloon_timeout
)
balloon_timeout
)
if
status
is
None
:
if
status
is
None
:
raise
exceptions
.
TestFail
(
"Failed to balloon memory to expect
"
self
.
test
.
fail
(
"Failed to balloon memory to expect value during
"
" value during
%ss"
%
balloon_timeout
)
"
%ss"
%
balloon_timeout
)
def
get_memory_boundary
(
self
):
def
get_memory_boundary
(
self
):
"""
"""
...
@@ -226,8 +224,8 @@ def run(test, params, env):
...
@@ -226,8 +224,8 @@ def run(test, params, env):
output
=
utils_misc
.
wait_for
(
_memory_check_after_sub_test
,
timeout
,
output
=
utils_misc
.
wait_for
(
_memory_check_after_sub_test
,
timeout
,
sleep_before_check
,
5
,
msg
)
sleep_before_check
,
5
,
msg
)
if
output
is
None
:
if
output
is
None
:
raise
exceptions
.
TestFail
(
"Check memory status failed after
"
test
.
fail
(
"Check memory status failed after subtest
"
"subtest
after %s seconds"
%
timeout
)
"
after %s seconds"
%
timeout
)
error_context
.
context
(
"Reset guest memory to original one after all the "
error_context
.
context
(
"Reset guest memory to original one after all the "
"test"
,
logging
.
info
)
"test"
,
logging
.
info
)
...
...
qemu/tests/balloon_check.py
浏览文件 @
ede41d4d
...
@@ -23,21 +23,22 @@ class BallooningTest(MemoryBaseTest):
...
@@ -23,21 +23,22 @@ class BallooningTest(MemoryBaseTest):
super
(
BallooningTest
,
self
).
__init__
(
test
,
params
,
env
)
super
(
BallooningTest
,
self
).
__init__
(
test
,
params
,
env
)
self
.
vm
=
env
.
get_vm
(
params
[
"main_vm"
])
self
.
vm
=
env
.
get_vm
(
params
[
"main_vm"
])
self
.
session
=
self
.
get_session
(
self
.
vm
)
if
params
.
get
(
"paused_after_start_vm"
)
!=
"yes"
:
self
.
params
[
"balloon_test_setup_ready"
]
=
False
self
.
params
[
"balloon_test_setup_ready"
]
=
False
if
self
.
params
.
get
(
'os_type'
)
==
'windows'
:
if
self
.
params
.
get
(
'os_type'
)
==
'windows'
:
sleep_time
=
180
sleep_time
=
180
else
:
else
:
sleep_time
=
90
sleep_time
=
90
logging
.
info
(
"Waiting %d seconds for guest's applications up"
%
sleep_time
)
logging
.
info
(
"Waiting %d seconds for guest's "
time
.
sleep
(
sleep_time
)
"applications up"
%
sleep_time
)
self
.
params
[
"balloon_test_setup_ready"
]
=
True
time
.
sleep
(
sleep_time
)
self
.
params
[
"balloon_test_setup_ready"
]
=
True
self
.
ori_gmem
=
self
.
get_memory_status
()
self
.
current_gmem
=
self
.
ori_gmem
self
.
ori_mem
=
self
.
get_vm_mem
(
self
.
vm
)
self
.
ori_mem
=
self
.
get_vm_mem
(
self
.
vm
)
self
.
current_mmem
=
self
.
get_ballooned_memory
()
self
.
current_mmem
=
self
.
get_ballooned_memory
()
if
self
.
current_mmem
!=
self
.
ori_mem
:
if
self
.
current_mmem
!=
self
.
ori_mem
:
self
.
balloon_memory
(
self
.
ori_mem
)
self
.
balloon_memory
(
self
.
ori_mem
)
self
.
ori_gmem
=
self
.
get_memory_status
()
self
.
current_gmem
=
self
.
ori_gmem
self
.
current_mmem
=
self
.
ori_mem
self
.
current_mmem
=
self
.
ori_mem
def
get_ballooned_memory
(
self
):
def
get_ballooned_memory
(
self
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录