提交 9775a017 编写于 作者: Y Yiqiao Pu

qemu.tests: Add clean up operations after tests in ksm_base

Quit ksm_overcommit_guest and turn on swap after test otherwise following
cases using this vm may failed because out of memory.

Also fix a small mistake in test steps.
Signed-off-by: NYiqiao Pu <ypu@redhat.com>
上级 8185a6c0
...@@ -102,7 +102,7 @@ def run(test, params, env): ...@@ -102,7 +102,7 @@ def run(test, params, env):
error.context("Start to allocate pages inside guest", logging.info) error.context("Start to allocate pages inside guest", logging.info)
_start_allocator(vm, session, 60) _start_allocator(vm, session, 60)
error.context("Turn off swap in guest", logging.info) error.context("Start to fill memory in guest", logging.info)
mem_fill = "mem = MemFill(%s, 0, %s)" % (shared_mem, seed) mem_fill = "mem = MemFill(%s, 0, %s)" % (shared_mem, seed)
_execute_allocator(mem_fill, vm, session, fill_timeout) _execute_allocator(mem_fill, vm, session, fill_timeout)
cmd = "mem.value_fill()" cmd = "mem.value_fill()"
...@@ -128,6 +128,12 @@ def run(test, params, env): ...@@ -128,6 +128,12 @@ def run(test, params, env):
if query_regex: if query_regex:
sharing_page_2 = re.findall(query_regex, sharing_page_2)[0] sharing_page_2 = re.findall(query_regex, sharing_page_2)[0]
# clean up work in guest
error.context("Clean up env in guest", logging.info)
session.cmd_output("die()", 20)
session.cmd_status_output("swapon -a")
session.cmd_output("echo 3 > /proc/sys/vm/drop_caches")
sharing_page = [sharing_page_0, sharing_page_1, sharing_page_2] sharing_page = [sharing_page_0, sharing_page_1, sharing_page_2]
for i in sharing_page: for i in sharing_page:
if re.findall("[A-Za-z]", i): if re.findall("[A-Za-z]", i):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册