Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
10e9f2a9
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,发现更多精彩内容 >>
未验证
提交
10e9f2a9
编写于
5月 10, 2018
作者:
X
Xu Han
提交者:
GitHub
5月 10, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1373 from XueqiangWei/update_old_fs_to_new_one
mkfs: update old fs to new one
上级
ca70a816
787905ce
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
10 deletion
+20
-10
generic/tests/cfg/lvm.cfg
generic/tests/cfg/lvm.cfg
+3
-0
generic/tests/lvm.py
generic/tests/lvm.py
+8
-7
qemu/tests/cfg/cdrom_test.cfg
qemu/tests/cfg/cdrom_test.cfg
+4
-1
qemu/tests/cfg/format_disk.cfg
qemu/tests/cfg/format_disk.cfg
+5
-2
未找到文件。
generic/tests/cfg/lvm.cfg
浏览文件 @
10e9f2a9
...
...
@@ -17,6 +17,9 @@
post_command_noncritical = no
clean = no
check_mount = "mountpoint /mnt/kvm_test_lvm"
fs_type = xfs
RHEL.6:
fs_type = ext4
variants:
- lvm_create:
sub_type = lvm_create
...
...
generic/tests/lvm.py
浏览文件 @
10e9f2a9
...
...
@@ -7,7 +7,7 @@ from virttest import utils_test
@
error_context
.
context_aware
def
mount_lv
(
lv_path
,
session
):
error_context
.
context
(
"mounting
ext3
filesystem made on logical volume %s"
error_context
.
context
(
"mounting filesystem made on logical volume %s"
%
os
.
path
.
basename
(
lv_path
),
logging
.
info
)
session
.
cmd
(
"mkdir -p /mnt/kvm_test_lvm"
)
session
.
cmd
(
"mount %s /mnt/kvm_test_lvm"
%
lv_path
)
...
...
@@ -15,7 +15,7 @@ def mount_lv(lv_path, session):
@
error_context
.
context_aware
def
umount_lv
(
lv_path
,
session
):
error_context
.
context
(
"umounting
ext3
filesystem made on logical volume "
error_context
.
context
(
"umounting filesystem made on logical volume "
"%s"
%
os
.
path
.
basename
(
lv_path
),
logging
.
info
)
session
.
cmd
(
"umount %s"
%
lv_path
)
session
.
cmd
(
"rm -rf /mnt/kvm_test_lvm"
)
...
...
@@ -57,6 +57,7 @@ def run(test, params, env):
timeout
=
params
.
get
(
"lvm_timeout"
,
"600"
)
check_mount
=
params
.
get
(
"check_mount"
,
"mountpoint /mnt/kvm_test_lvm"
)
sub_type
=
params
.
get
(
"sub_type"
,
"lvm_create"
)
fs_type
=
params
.
get
(
"fs_type"
,
"ext4"
)
try
:
if
sub_type
==
"lvm_create"
:
disk_list
=
[]
...
...
@@ -79,13 +80,13 @@ def run(test, params, env):
error_context
.
context
(
"creating logical volume on volume group %s"
%
vg_name
,
logging
.
info
)
session
.
cmd
(
"lvcreate -L2000 -n %s %s"
%
(
lv_name
,
vg_name
))
error_context
.
context
(
"creating
ext3
filesystem on logical volume"
" %s"
%
lv_name
,
logging
.
info
)
session
.
cmd
(
"yes | mkfs.
ext3 %s"
%
lv_path
,
timeout
=
int
(
timeout
))
error_context
.
context
(
"creating
%s
filesystem on logical volume"
" %s"
%
(
fs_type
,
lv_name
)
,
logging
.
info
)
session
.
cmd
(
"yes | mkfs.
%s %s"
%
(
fs_type
,
lv_path
)
,
timeout
=
int
(
timeout
))
mount_lv
(
lv_path
,
session
)
umount_lv
(
lv_path
,
session
)
error_context
.
context
(
"checking
ext3
filesystem made on logical "
"volume %s"
%
lv_name
,
logging
.
info
)
error_context
.
context
(
"checking
%s
filesystem made on logical "
"volume %s"
%
(
fs_type
,
lv_name
)
,
logging
.
info
)
session
.
cmd
(
"fsck %s"
%
lv_path
,
timeout
=
int
(
timeout
))
if
clean
==
"no"
:
mount_lv
(
lv_path
,
session
)
...
...
qemu/tests/cfg/cdrom_test.cfg
浏览文件 @
10e9f2a9
...
...
@@ -74,7 +74,10 @@
src_file = "%s/%s"
dst_file = "${tmp_dir}/%s"
tray_check_cmd = "python ${tray_check_src} %s"
readonly_test_cmd = "echo y|mkfs.ext2 %s"
fs_type = xfs
RHEL.6:
fs_type = ext4
readonly_test_cmd = "echo y|mkfs.${fs_type} %s"
lock_cdrom_cmd = "eject -i on %s"
unlock_cdrom_cmd = "eject -i off %s"
eject_cdrom_cmd = "eject %s"
...
...
qemu/tests/cfg/format_disk.cfg
浏览文件 @
10e9f2a9
...
...
@@ -13,11 +13,14 @@
cmd_timeout = 1200
# The following parameters will be overriden in guest-os config files.
create_partition_cmd = ""
format_cmd = "yes | mkfs.ext3 {0}"
fs_type = xfs
RHEL.6:
fs_type = ext4
format_cmd = "yes | mkfs.${fs_type} {0}"
list_disk_cmd = ""
set_online_cmd = ""
show_dev_cmd = "ls {0}"
mount_cmd = "mkdir -p /media && mount -t
ext3
{0} /media"
mount_cmd = "mkdir -p /media && mount -t
${fs_type}
{0} /media"
show_mount_cmd = "mount | grep {0}"
umount_cmd = "umount {0}"
testfile_name = "/media/format_disk-test.txt"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录