summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGui Chen <gui.chen@intel.com>2012-12-20 15:25:04 +0800
committerGui Chen <gui.chen@intel.com>2012-12-20 15:25:04 +0800
commit946725e1d0666fe7f4d4eee9253e092f82a3f175 (patch)
tree21288f031695c94f2879823eae1c30e6b3ffb793
parente5d2ffb6e83e01027cc7e4595af1e44f10dfee3e (diff)
downloadmic-946725e1d0666fe7f4d4eee9253e092f82a3f175.tar.gz
mic-946725e1d0666fe7f4d4eee9253e092f82a3f175.tar.bz2
mic-946725e1d0666fe7f4d4eee9253e092f82a3f175.zip
keep only unittest
Signed-off-by: Gui Chen <gui.chen@intel.com>
-rw-r--r--tests/README23
-rwxr-xr-xtests/addcase.sh31
-rw-r--r--tests/baseimgr_fixtures/i586/A-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/A-0.1-1.i586.rpm)bin1396 -> 1396 bytes
-rw-r--r--tests/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm)bin1404 -> 1404 bytes
-rw-r--r--tests/baseimgr_fixtures/i586/B-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/B-0.1-1.i586.rpm)bin1392 -> 1392 bytes
-rw-r--r--tests/baseimgr_fixtures/i586/D-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/D-0.1-1.i586.rpm)bin1460 -> 1460 bytes
-rw-r--r--tests/baseimgr_fixtures/i586/E-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/E-0.1-1.i586.rpm)bin1404 -> 1404 bytes
-rw-r--r--tests/baseimgr_fixtures/i586/G-0.1-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/i586/G-0.1-1.i586.rpm)bin1396 -> 1396 bytes
-rw-r--r--tests/baseimgr_fixtures/i686/C-0.2-1.i686.rpm (renamed from tests/unittest/baseimgr_fixtures/i686/C-0.2-1.i686.rpm)bin1396 -> 1396 bytes
-rw-r--r--tests/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm (renamed from tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm)bin1228 -> 1228 bytes
-rw-r--r--tests/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm (renamed from tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm)bin1396 -> 1396 bytes
-rw-r--r--tests/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm (renamed from tests/unittest/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm)bin1224 -> 1224 bytes
-rw-r--r--tests/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm (renamed from tests/unittest/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm)bin1224 -> 1224 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz (renamed from tests/unittest/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz)bin316 -> 316 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz (renamed from tests/unittest/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz)bin350 -> 350 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/filelists.xml.gz (renamed from tests/unittest/baseimgr_fixtures/repodata/filelists.xml.gz)bin699 -> 699 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/other.xml.gz (renamed from tests/unittest/baseimgr_fixtures/repodata/other.xml.gz)bin697 -> 697 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/primary.xml.gz (renamed from tests/unittest/baseimgr_fixtures/repodata/primary.xml.gz)bin1372 -> 1372 bytes
-rw-r--r--tests/baseimgr_fixtures/repodata/repomd.xml (renamed from tests/unittest/baseimgr_fixtures/repodata/repomd.xml)0
-rw-r--r--tests/baseimgr_fixtures/test.ks (renamed from tests/unittest/baseimgr_fixtures/test.ks)0
-rw-r--r--tests/chroot_fixtures/minchroot.tar.gz (renamed from tests/unittest/chroot_fixtures/minchroot.tar.gz)bin1438891 -> 1438891 bytes
-rw-r--r--tests/configmgr_fixtures/mic.conf (renamed from tests/unittest/configmgr_fixtures/mic.conf)0
-rw-r--r--tests/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2 (renamed from tests/unittest/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2)bin679 -> 679 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/filelists.xml.gz (renamed from tests/unittest/configmgr_fixtures/packages/repodata/filelists.xml.gz)bin304 -> 304 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/other.sqlite.bz2 (renamed from tests/unittest/configmgr_fixtures/packages/repodata/other.sqlite.bz2)bin644 -> 644 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/other.xml.gz (renamed from tests/unittest/configmgr_fixtures/packages/repodata/other.xml.gz)bin299 -> 299 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/primary.sqlite.bz2 (renamed from tests/unittest/configmgr_fixtures/packages/repodata/primary.sqlite.bz2)bin1616 -> 1616 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/primary.xml.gz (renamed from tests/unittest/configmgr_fixtures/packages/repodata/primary.xml.gz)bin654 -> 654 bytes
-rw-r--r--tests/configmgr_fixtures/packages/repodata/repomd.xml (renamed from tests/unittest/configmgr_fixtures/packages/repodata/repomd.xml)0
-rw-r--r--tests/configmgr_fixtures/packages/test-0-1.i686.rpm (renamed from tests/unittest/configmgr_fixtures/packages/test-0-1.i686.rpm)bin1400 -> 1400 bytes
-rw-r--r--tests/configmgr_fixtures/test.ks (renamed from tests/unittest/configmgr_fixtures/test.ks)0
-rw-r--r--tests/mic-test.py45
-rw-r--r--tests/mic_cases/base/customer.conf19
-rw-r--r--tests/mic_cases/base/test.conf19
-rw-r--r--tests/mic_cases/base/test.ks61
-rw-r--r--tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_o_release_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_fs_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_fs_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_fs_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_fs_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_loop_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_loop_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_loop_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_loop_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_loop_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_loop_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options1
-rw-r--r--tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf0
-rw-r--r--tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_raw_pkg_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_raw_yum/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_raw_yum/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_raw_yum/options1
-rw-r--r--tests/mic_cases/test-armv7hl_raw_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-armv7hl_raw_zypp/ks.p130
-rw-r--r--tests/mic_cases/test-armv7hl_raw_zypp/options1
-rw-r--r--tests/mic_cases/test-ch_h/conf.p0
-rw-r--r--tests/mic_cases/test-ch_h/expect9
-rw-r--r--tests/mic_cases/test-ch_h/ks.p0
-rw-r--r--tests/mic_cases/test-ch_h/options1
-rw-r--r--tests/mic_cases/test-ch_help/conf.p0
-rw-r--r--tests/mic_cases/test-ch_help/expect9
-rw-r--r--tests/mic_cases/test-ch_help/ks.p0
-rw-r--r--tests/mic_cases/test-ch_help/options1
-rw-r--r--tests/mic_cases/test-chroot_h/conf.p0
-rw-r--r--tests/mic_cases/test-chroot_h/expect9
-rw-r--r--tests/mic_cases/test-chroot_h/ks.p0
-rw-r--r--tests/mic_cases/test-chroot_h/options1
-rw-r--r--tests/mic_cases/test-chroot_help/conf.p0
-rw-r--r--tests/mic_cases/test-chroot_help/expect9
-rw-r--r--tests/mic_cases/test-chroot_help/ks.p0
-rw-r--r--tests/mic_cases/test-chroot_help/options1
-rw-r--r--tests/mic_cases/test-convert_h/conf.p0
-rw-r--r--tests/mic_cases/test-convert_h/expect8
-rw-r--r--tests/mic_cases/test-convert_h/ks.p0
-rw-r--r--tests/mic_cases/test-convert_h/options1
-rw-r--r--tests/mic_cases/test-convert_help/conf.p0
-rw-r--r--tests/mic_cases/test-convert_help/expect8
-rw-r--r--tests/mic_cases/test-convert_help/ks.p0
-rw-r--r--tests/mic_cases/test-convert_help/options1
-rw-r--r--tests/mic_cases/test-cr_fs_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_fs_h/expect8
-rw-r--r--tests/mic_cases/test-cr_fs_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_fs_h/options1
-rw-r--r--tests/mic_cases/test-cr_fs_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_fs_help/expect8
-rw-r--r--tests/mic_cases/test-cr_fs_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_fs_help/options1
-rw-r--r--tests/mic_cases/test-cr_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_h/expect40
-rw-r--r--tests/mic_cases/test-cr_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_h/options1
-rw-r--r--tests/mic_cases/test-cr_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_help/expect40
-rw-r--r--tests/mic_cases/test-cr_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_help/options1
-rw-r--r--tests/mic_cases/test-cr_help_2line/conf.p0
-rw-r--r--tests/mic_cases/test-cr_help_2line/expect40
-rw-r--r--tests/mic_cases/test-cr_help_2line/ks.p0
-rw-r--r--tests/mic_cases/test-cr_help_2line/options1
-rw-r--r--tests/mic_cases/test-cr_help_mark/conf.p0
-rw-r--r--tests/mic_cases/test-cr_help_mark/expect40
-rw-r--r--tests/mic_cases/test-cr_help_mark/ks.p0
-rw-r--r--tests/mic_cases/test-cr_help_mark/options1
-rw-r--r--tests/mic_cases/test-cr_livecd_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_livecd_h/expect7
-rw-r--r--tests/mic_cases/test-cr_livecd_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_livecd_h/options1
-rw-r--r--tests/mic_cases/test-cr_livecd_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_livecd_help/expect7
-rw-r--r--tests/mic_cases/test-cr_livecd_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_livecd_help/options1
-rw-r--r--tests/mic_cases/test-cr_liveusb_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_liveusb_h/expect7
-rw-r--r--tests/mic_cases/test-cr_liveusb_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_liveusb_h/options1
-rw-r--r--tests/mic_cases/test-cr_liveusb_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_liveusb_help/expect7
-rw-r--r--tests/mic_cases/test-cr_liveusb_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_liveusb_help/options1
-rw-r--r--tests/mic_cases/test-cr_loop_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_loop_h/expect10
-rw-r--r--tests/mic_cases/test-cr_loop_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_loop_h/options1
-rw-r--r--tests/mic_cases/test-cr_loop_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_loop_help/expect10
-rw-r--r--tests/mic_cases/test-cr_loop_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_loop_help/options1
-rw-r--r--tests/mic_cases/test-cr_raw_h/conf.p0
-rw-r--r--tests/mic_cases/test-cr_raw_h/expect7
-rw-r--r--tests/mic_cases/test-cr_raw_h/ks.p0
-rw-r--r--tests/mic_cases/test-cr_raw_h/options1
-rw-r--r--tests/mic_cases/test-cr_raw_help/conf.p0
-rw-r--r--tests/mic_cases/test-cr_raw_help/expect7
-rw-r--r--tests/mic_cases/test-cr_raw_help/ks.p0
-rw-r--r--tests/mic_cases/test-cr_raw_help/options1
-rw-r--r--tests/mic_cases/test-create_fs_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_fs_h/expect8
-rw-r--r--tests/mic_cases/test-create_fs_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_fs_h/options1
-rw-r--r--tests/mic_cases/test-create_fs_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_fs_help/expect8
-rw-r--r--tests/mic_cases/test-create_fs_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_fs_help/options1
-rw-r--r--tests/mic_cases/test-create_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_h/expect40
-rw-r--r--tests/mic_cases/test-create_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_h/options1
-rw-r--r--tests/mic_cases/test-create_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_help/expect40
-rw-r--r--tests/mic_cases/test-create_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_help/options1
-rw-r--r--tests/mic_cases/test-create_help_2line/conf.p0
-rw-r--r--tests/mic_cases/test-create_help_2line/expect40
-rw-r--r--tests/mic_cases/test-create_help_2line/ks.p0
-rw-r--r--tests/mic_cases/test-create_help_2line/options1
-rw-r--r--tests/mic_cases/test-create_help_mark/conf.p0
-rw-r--r--tests/mic_cases/test-create_help_mark/expect40
-rw-r--r--tests/mic_cases/test-create_help_mark/ks.p0
-rw-r--r--tests/mic_cases/test-create_help_mark/options1
-rw-r--r--tests/mic_cases/test-create_livecd_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_livecd_h/expect7
-rw-r--r--tests/mic_cases/test-create_livecd_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_livecd_h/options1
-rw-r--r--tests/mic_cases/test-create_livecd_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_livecd_help/expect7
-rw-r--r--tests/mic_cases/test-create_livecd_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_livecd_help/options1
-rw-r--r--tests/mic_cases/test-create_liveusb_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_liveusb_h/expect7
-rw-r--r--tests/mic_cases/test-create_liveusb_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_liveusb_h/options1
-rw-r--r--tests/mic_cases/test-create_liveusb_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_liveusb_help/expect7
-rw-r--r--tests/mic_cases/test-create_liveusb_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_liveusb_help/options1
-rw-r--r--tests/mic_cases/test-create_loop_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_loop_h/expect10
-rw-r--r--tests/mic_cases/test-create_loop_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_loop_h/options1
-rw-r--r--tests/mic_cases/test-create_loop_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_loop_help/expect10
-rw-r--r--tests/mic_cases/test-create_loop_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_loop_help/options1
-rw-r--r--tests/mic_cases/test-create_raw_h/conf.p0
-rw-r--r--tests/mic_cases/test-create_raw_h/expect7
-rw-r--r--tests/mic_cases/test-create_raw_h/ks.p0
-rw-r--r--tests/mic_cases/test-create_raw_h/options1
-rw-r--r--tests/mic_cases/test-create_raw_help/conf.p0
-rw-r--r--tests/mic_cases/test-create_raw_help/expect7
-rw-r--r--tests/mic_cases/test-create_raw_help/ks.p0
-rw-r--r--tests/mic_cases/test-create_raw_help/options1
-rw-r--r--tests/mic_cases/test-cv_h/conf.p0
-rw-r--r--tests/mic_cases/test-cv_h/expect8
-rw-r--r--tests/mic_cases/test-cv_h/ks.p0
-rw-r--r--tests/mic_cases/test-cv_h/options1
-rw-r--r--tests/mic_cases/test-cv_help/conf.p0
-rw-r--r--tests/mic_cases/test-cv_help/expect8
-rw-r--r--tests/mic_cases/test-cv_help/ks.p0
-rw-r--r--tests/mic_cases/test-cv_help/options1
-rw-r--r--tests/mic_cases/test-h/conf.p0
-rw-r--r--tests/mic_cases/test-h/expect16
-rw-r--r--tests/mic_cases/test-h/ks.p0
-rw-r--r--tests/mic_cases/test-h/options1
-rw-r--r--tests/mic_cases/test-help/conf.p0
-rw-r--r--tests/mic_cases/test-help/expect16
-rw-r--r--tests/mic_cases/test-help/ks.p0
-rw-r--r--tests/mic_cases/test-help/options1
-rw-r--r--tests/mic_cases/test-help_mark/conf.p0
-rw-r--r--tests/mic_cases/test-help_mark/expect16
-rw-r--r--tests/mic_cases/test-help_mark/ks.p0
-rw-r--r--tests/mic_cases/test-help_mark/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_include_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_include_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_include_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_include_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_include_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_include_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_release_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_outdir_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_record_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_record_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_record_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_fs_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_fs_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_log_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_log_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_log_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_pkgs_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_release_pkg_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_livecd_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_livecd_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_log_record_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_record_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_liveusb_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_liveusb_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_o_log_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_o_log_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_o_log_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_release_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_release_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_release_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_taring_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_loop_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_loop_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_raw_record/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_record/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_record/options1
-rw-r--r--tests/mic_cases/test-ia32_raw_record_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_record_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_record_zypp/options1
-rw-r--r--tests/mic_cases/test-ia32_raw_yum/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_yum/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_yum/options1
-rw-r--r--tests/mic_cases/test-ia32_raw_zypp/conf.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_zypp/ks.p0
-rw-r--r--tests/mic_cases/test-ia32_raw_zypp/options1
-rw-r--r--tests/mic_cases/test-version/conf.p0
-rw-r--r--tests/mic_cases/test-version/expect1
-rw-r--r--tests/mic_cases/test-version/ks.p0
-rw-r--r--tests/mic_cases/test-version/options1
-rw-r--r--tests/pluginmgr_fixtures/backend/yumtest.py (renamed from tests/unittest/pluginmgr_fixtures/backend/yumtest.py)0
-rw-r--r--tests/pluginmgr_fixtures/backend/zypptest.py (renamed from tests/unittest/pluginmgr_fixtures/backend/zypptest.py)0
-rw-r--r--tests/pluginmgr_fixtures/imager/fs_test.py (renamed from tests/unittest/pluginmgr_fixtures/imager/fs_test.py)0
-rw-r--r--tests/pluginmgr_fixtures/imager/loop_test.py (renamed from tests/unittest/pluginmgr_fixtures/imager/loop_test.py)0
-rw-r--r--tests/suite.py (renamed from tests/unittest/suite.py)0
-rw-r--r--tests/test_baseimager.py (renamed from tests/unittest/test_baseimager.py)0
-rw-r--r--tests/test_chroot.py (renamed from tests/unittest/test_chroot.py)0
-rw-r--r--tests/test_configmgr.py (renamed from tests/unittest/test_configmgr.py)0
-rw-r--r--tests/test_msger.py (renamed from tests/unittest/test_msger.py)0
-rw-r--r--tests/test_pluginmgr.py (renamed from tests/unittest/test_pluginmgr.py)0
-rw-r--r--tests/test_runner.py (renamed from tests/unittest/test_runner.py)0
-rw-r--r--tests/testbase.py99
351 files changed, 0 insertions, 2797 deletions
diff --git a/tests/README b/tests/README
deleted file mode 100644
index 3bd0751..0000000
--- a/tests/README
+++ /dev/null
@@ -1,23 +0,0 @@
-----------------------
-MIC autotest framework
-----------------------
-
-Included testcase:
-===================
-* check image creation
-* check root permission
-* check availability of ks file
-
-Basic usage description:
-========================
-- add testcase
- * customize your own testcase, meet your own needs
- run the shell script named "addcase", follow its usage:
- ./addcase.sh <casename> <caseks>. <casename> represents the name of
- your testcase, <caseks> represents your ks file
-
-- run mic-test
- * test MIC with all testcases
- run "make test" or "python mic-test.py", you will get the result of
- the sanity test(included testcase + custom testcase). The format of
- the result looks like this: testcase name ... FAIL | ok
diff --git a/tests/addcase.sh b/tests/addcase.sh
deleted file mode 100755
index 7fbaaab..0000000
--- a/tests/addcase.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-if [ $# -ne 2 ]; then
- echo "Usage: addcase.sh <case-name> <case-ksfile>"
- exit 1
-fi
-
-CaseName=$1
-CaseKs=$2
-
-diff -upN ./mic_cases/base/test.ks ${CaseKs} > ks.p
-
-cp ./mic_cases/base/test.conf conf_new
-vi conf_new
-diff -upN ./mic_cases/base/test.conf conf_new > conf.p
-rm -f conf_new
-
-cd ./mic_cases
-mkdir test-${CaseName}
-cd test-${CaseName}
-
-mv ../../ks.p .
-mv ../../conf.p .
-vi options
-vi expect
-
-echo 'Ks diff:'
-cat ks.p
-
-echo 'Config diff:'
-cat conf.p
diff --git a/tests/unittest/baseimgr_fixtures/i586/A-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/A-0.1-1.i586.rpm
index b608485..b608485 100644
--- a/tests/unittest/baseimgr_fixtures/i586/A-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/A-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm
index 4c790d1..4c790d1 100644
--- a/tests/unittest/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/ABC-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i586/B-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/B-0.1-1.i586.rpm
index 3d693db..3d693db 100644
--- a/tests/unittest/baseimgr_fixtures/i586/B-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/B-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i586/D-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/D-0.1-1.i586.rpm
index 0eb4310..0eb4310 100644
--- a/tests/unittest/baseimgr_fixtures/i586/D-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/D-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i586/E-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/E-0.1-1.i586.rpm
index 0c0a92d..0c0a92d 100644
--- a/tests/unittest/baseimgr_fixtures/i586/E-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/E-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i586/G-0.1-1.i586.rpm b/tests/baseimgr_fixtures/i586/G-0.1-1.i586.rpm
index 95a583a..95a583a 100644
--- a/tests/unittest/baseimgr_fixtures/i586/G-0.1-1.i586.rpm
+++ b/tests/baseimgr_fixtures/i586/G-0.1-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/i686/C-0.2-1.i686.rpm b/tests/baseimgr_fixtures/i686/C-0.2-1.i686.rpm
index 1235866..1235866 100644
--- a/tests/unittest/baseimgr_fixtures/i686/C-0.2-1.i686.rpm
+++ b/tests/baseimgr_fixtures/i686/C-0.2-1.i686.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm b/tests/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm
index 7614cef..7614cef 100644
--- a/tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm
+++ b/tests/baseimgr_fixtures/localpkgs/H-0.2-1.armv7hl.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm b/tests/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm
index 896bd53..896bd53 100644
--- a/tests/unittest/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm
+++ b/tests/baseimgr_fixtures/localpkgs/H-0.2-1.i586.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm b/tests/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm
index 80e9138..80e9138 100644
--- a/tests/unittest/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm
+++ b/tests/baseimgr_fixtures/noarch/F-0.1-1.noarch.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm b/tests/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm
index 8940b59..8940b59 100644
--- a/tests/unittest/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm
+++ b/tests/baseimgr_fixtures/noarch/H-0.1-1.noarch.rpm
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz b/tests/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz
index ec5cb9e..ec5cb9e 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz
+++ b/tests/baseimgr_fixtures/repodata/4bb63d1039a6f0d3fd1e7035acff76e7015963cabab2751263c7a20f4ff1c668-group.xml.gz
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz b/tests/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz
index ba21df6..ba21df6 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz
+++ b/tests/baseimgr_fixtures/repodata/ea95ecaccf9abc214715b1724188a3ecfcae1eb9b7855127938b39de83fbc303-patterns.xml.gz
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/filelists.xml.gz b/tests/baseimgr_fixtures/repodata/filelists.xml.gz
index 1c54c61..1c54c61 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/filelists.xml.gz
+++ b/tests/baseimgr_fixtures/repodata/filelists.xml.gz
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/other.xml.gz b/tests/baseimgr_fixtures/repodata/other.xml.gz
index bfb4320..bfb4320 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/other.xml.gz
+++ b/tests/baseimgr_fixtures/repodata/other.xml.gz
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/primary.xml.gz b/tests/baseimgr_fixtures/repodata/primary.xml.gz
index aaf0423..aaf0423 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/primary.xml.gz
+++ b/tests/baseimgr_fixtures/repodata/primary.xml.gz
Binary files differ
diff --git a/tests/unittest/baseimgr_fixtures/repodata/repomd.xml b/tests/baseimgr_fixtures/repodata/repomd.xml
index dad3740..dad3740 100644
--- a/tests/unittest/baseimgr_fixtures/repodata/repomd.xml
+++ b/tests/baseimgr_fixtures/repodata/repomd.xml
diff --git a/tests/unittest/baseimgr_fixtures/test.ks b/tests/baseimgr_fixtures/test.ks
index aa0425f..aa0425f 100644
--- a/tests/unittest/baseimgr_fixtures/test.ks
+++ b/tests/baseimgr_fixtures/test.ks
diff --git a/tests/unittest/chroot_fixtures/minchroot.tar.gz b/tests/chroot_fixtures/minchroot.tar.gz
index bccd3f7..bccd3f7 100644
--- a/tests/unittest/chroot_fixtures/minchroot.tar.gz
+++ b/tests/chroot_fixtures/minchroot.tar.gz
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/mic.conf b/tests/configmgr_fixtures/mic.conf
index 8418475..8418475 100644
--- a/tests/unittest/configmgr_fixtures/mic.conf
+++ b/tests/configmgr_fixtures/mic.conf
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2 b/tests/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2
index 0fbd0df..0fbd0df 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2
+++ b/tests/configmgr_fixtures/packages/repodata/filelists.sqlite.bz2
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/filelists.xml.gz b/tests/configmgr_fixtures/packages/repodata/filelists.xml.gz
index d4eec18..d4eec18 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/filelists.xml.gz
+++ b/tests/configmgr_fixtures/packages/repodata/filelists.xml.gz
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/other.sqlite.bz2 b/tests/configmgr_fixtures/packages/repodata/other.sqlite.bz2
index 2054a8c..2054a8c 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/other.sqlite.bz2
+++ b/tests/configmgr_fixtures/packages/repodata/other.sqlite.bz2
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/other.xml.gz b/tests/configmgr_fixtures/packages/repodata/other.xml.gz
index a180630..a180630 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/other.xml.gz
+++ b/tests/configmgr_fixtures/packages/repodata/other.xml.gz
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/primary.sqlite.bz2 b/tests/configmgr_fixtures/packages/repodata/primary.sqlite.bz2
index fe8e476..fe8e476 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/primary.sqlite.bz2
+++ b/tests/configmgr_fixtures/packages/repodata/primary.sqlite.bz2
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/primary.xml.gz b/tests/configmgr_fixtures/packages/repodata/primary.xml.gz
index 51555e4..51555e4 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/primary.xml.gz
+++ b/tests/configmgr_fixtures/packages/repodata/primary.xml.gz
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/packages/repodata/repomd.xml b/tests/configmgr_fixtures/packages/repodata/repomd.xml
index ba3baf7..ba3baf7 100644
--- a/tests/unittest/configmgr_fixtures/packages/repodata/repomd.xml
+++ b/tests/configmgr_fixtures/packages/repodata/repomd.xml
diff --git a/tests/unittest/configmgr_fixtures/packages/test-0-1.i686.rpm b/tests/configmgr_fixtures/packages/test-0-1.i686.rpm
index 76d728e..76d728e 100644
--- a/tests/unittest/configmgr_fixtures/packages/test-0-1.i686.rpm
+++ b/tests/configmgr_fixtures/packages/test-0-1.i686.rpm
Binary files differ
diff --git a/tests/unittest/configmgr_fixtures/test.ks b/tests/configmgr_fixtures/test.ks
index 6e15df8..6e15df8 100644
--- a/tests/unittest/configmgr_fixtures/test.ks
+++ b/tests/configmgr_fixtures/test.ks
diff --git a/tests/mic-test.py b/tests/mic-test.py
deleted file mode 100644
index efb775a..0000000
--- a/tests/mic-test.py
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-import unittest
-import os, sys, glob, tempfile, shutil
-from testbase import *
-
-class TestMIC(unittest.TestCase):
- cases_dir = "mic_cases"
- if os.path.isdir(cases_dir):
- for case in glob.glob(os.path.join(cases_dir,'test-*')):
- case = os.path.basename(case)[5:]
- method = """
-def test_%s(self):
- self._testTemplate("%s")
-""" % (case, case)
- exec method in locals()
-
- def setUp(self):
- self.work_env = tempfile.mkdtemp()
-
- def tearDown(self):
- shutil.rmtree(self.work_env, ignore_errors = True)
-
- def test_stub(self):
- """
- Empty test just to make nose to run at least one test.
- without tests but with tests/ directory Jenkins job will fail.
- """
- assert True
-
- def _testTemplate(self, case):
- """test function"""
- PrepEnv(self.cases_dir, case, self.work_env)
- RunandCheck(self, self.work_env)
-
-def MICtestsuite():
- suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__])
- alltests = unittest.TestSuite(suite)
- return alltests
-
-if __name__ == '__main__':
- if os.getuid() != 0:
- raise SystemExit("Root permission is needed")
-
- suite = MICtestsuite()
- unittest.TextTestRunner(verbosity=2).run(suite)
diff --git a/tests/mic_cases/base/customer.conf b/tests/mic_cases/base/customer.conf
deleted file mode 100644
index fc20dfb..0000000
--- a/tests/mic_cases/base/customer.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[common]
-; general settings
-
-[create]
-; settings for create subcommand
-tmpdir= /var/tmp/mic
-cachedir= /var/tmp/mic/cache
-outdir= ./mic-output
-pkgmgr = zypp
-
-; proxy = http://proxy.yourcompany.com:8080/
-; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
-
-[convert]
-; settings for convert subcommand
-
-[chroot]
-; settings for chroot subcommand
-
diff --git a/tests/mic_cases/base/test.conf b/tests/mic_cases/base/test.conf
deleted file mode 100644
index fc20dfb..0000000
--- a/tests/mic_cases/base/test.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-[common]
-; general settings
-
-[create]
-; settings for create subcommand
-tmpdir= /var/tmp/mic
-cachedir= /var/tmp/mic/cache
-outdir= ./mic-output
-pkgmgr = zypp
-
-; proxy = http://proxy.yourcompany.com:8080/
-; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
-
-[convert]
-; settings for convert subcommand
-
-[chroot]
-; settings for chroot subcommand
-
diff --git a/tests/mic_cases/base/test.ks b/tests/mic_cases/base/test.ks
deleted file mode 100644
index 6cb91bb..0000000
--- a/tests/mic_cases/base/test.ks
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-
-#
-# Do not Edit! Generated by:
-# kickstarter.py
-#
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/Los_Angeles
-part / --size 3000 --ondisk sda --fstype=ext3
-rootpw meego
-xconfig --startxonboot
-bootloader --timeout=0 --append="quiet"
-desktop --autologinuser=meego
-user --name meego --groups audio,video --password meego
-
-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
-repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
-%packages
-
-@MeeGo Base Development
-@Base Double Byte IME Support
-@MeeGo Compliance
-@MeeGo Core
-@MeeGo X Window System
-@X for Netbooks
-@MeeGo Netbook
-@MeeGo Netbook Desktop
-@Printing
-@Games
-
-kernel-adaptation-pinetrail
-
-%end
-
-%post
-# save a little bit of space at least...
-rm -f /boot/initrd*
-
-# Prelink can reduce boot time
-if [ -x /usr/sbin/prelink ]; then
- /usr/sbin/prelink -aRqm
-fi
-
-rm -f /var/lib/rpm/__db*
-rpm --rebuilddb
-
-
-%end
-
-%post --nochroot
-if [ -n "$IMG_NAME" ]; then
- echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release
-fi
-
-
-%end
diff --git a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options
deleted file mode 100644
index 36c4efe..0000000
--- a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --config=customer.conf --pkgmgr=zypp --outdir=outdir10 --release=XXX --logfile=logfile9 --record-pkgs=name
diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options
deleted file mode 100644
index 4d6441f..0000000
--- a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --pkgmgr=yum --include-src --logfile=logfile1
diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p b/tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf b/tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/options b/tests/mic_cases/test-armv7hl_fs_o_release_yum/options
deleted file mode 100644
index b2585a3..0000000
--- a/tests/mic_cases/test-armv7hl_fs_o_release_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --pkgmgr=yum -o outdir13 --release=XXX
diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options
deleted file mode 100644
index 70a1144..0000000
--- a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --outdir=outdir11 --release=XXX --pkgmgr=zypp
diff --git a/tests/mic_cases/test-armv7hl_fs_yum/conf.p b/tests/mic_cases/test-armv7hl_fs_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_yum/options b/tests/mic_cases/test-armv7hl_fs_yum/options
deleted file mode 100644
index b6bba66..0000000
--- a/tests/mic_cases/test-armv7hl_fs_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --pkgmgr=yum
diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/conf.p b/tests/mic_cases/test-armv7hl_fs_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_fs_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/ks.p b/tests/mic_cases/test-armv7hl_fs_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_fs_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/options b/tests/mic_cases/test-armv7hl_fs_zypp/options
deleted file mode 100644
index 2c7e47b..0000000
--- a/tests/mic_cases/test-armv7hl_fs_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --arch=armv7hl --pkgmgr=zypp
diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options
deleted file mode 100644
index 11143ae..0000000
--- a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --arch=armv7hl --pkgmgr=yum -o outdir12 --record-pkgs=name,license,content
diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options
deleted file mode 100644
index 344a5cb..0000000
--- a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --taring-to=XXX --pkgmgr=zypp
diff --git a/tests/mic_cases/test-armv7hl_loop_yum/conf.p b/tests/mic_cases/test-armv7hl_loop_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_loop_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_loop_yum/ks.p b/tests/mic_cases/test-armv7hl_loop_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_loop_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_loop_yum/options b/tests/mic_cases/test-armv7hl_loop_yum/options
deleted file mode 100644
index 1a9d71a..0000000
--- a/tests/mic_cases/test-armv7hl_loop_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --arch=armv7hl --pkgmgr=yum
diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/conf.p b/tests/mic_cases/test-armv7hl_loop_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_loop_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/ks.p b/tests/mic_cases/test-armv7hl_loop_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_loop_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/options b/tests/mic_cases/test-armv7hl_loop_zypp/options
deleted file mode 100644
index 36b0d65..0000000
--- a/tests/mic_cases/test-armv7hl_loop_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --arch=armv7hl --pkgmgr=zypp
diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options
deleted file mode 100644
index e43ded7..0000000
--- a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --arch=armv7hl --pkgmgr=zypp -c customer.conf --release=XXX --logfile=logfile10
diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p b/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf b/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p b/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/options b/tests/mic_cases/test-armv7hl_raw_pkg_yum/options
deleted file mode 100644
index c46b72d..0000000
--- a/tests/mic_cases/test-armv7hl_raw_pkg_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --arch=armv7hl --pkgmgr=yum --arch=armv7hl
diff --git a/tests/mic_cases/test-armv7hl_raw_yum/conf.p b/tests/mic_cases/test-armv7hl_raw_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_raw_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_raw_yum/ks.p b/tests/mic_cases/test-armv7hl_raw_yum/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_raw_yum/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_raw_yum/options b/tests/mic_cases/test-armv7hl_raw_yum/options
deleted file mode 100644
index a05e7a6..0000000
--- a/tests/mic_cases/test-armv7hl_raw_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --arch=armv7hl --pkgmgr=yum
diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/conf.p b/tests/mic_cases/test-armv7hl_raw_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-armv7hl_raw_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/ks.p b/tests/mic_cases/test-armv7hl_raw_zypp/ks.p
deleted file mode 100644
index 119d429..0000000
--- a/tests/mic_cases/test-armv7hl_raw_zypp/ks.p
+++ /dev/null
@@ -1,130 +0,0 @@
---- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
-+++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
-@@ -1,4 +1,4 @@
--# -*-mic2-options-*- -f livecd -*-mic2-options-*-
-+# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
-
- #
- # Do not Edit! Generated by:
-@@ -8,32 +8,30 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# This is not used currently. It is here because the /boot partition
-+# needs to be the partition number 3 for the u-boot usage.
-+part swap --size=8 --ondisk mmcblk0p --fstype=swap
-+
-+# This partition is made so that u-boot can find the kernel
-+part /boot --size=32 --ondisk mmcblk0p --fstype=vfat
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
- repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
- repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
-
--%packages
-+%packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
-
--kernel-adaptation-pinetrail
-+kernel-adaptation-n900
-
- %end
-
-@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-linux' > /etc/rpm/platform
-+
-+# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-+# https://bugs.meego.com/show_bug.cgi?id=11484
-+echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
-nf
-+
-
- %end
-
diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/options b/tests/mic_cases/test-armv7hl_raw_zypp/options
deleted file mode 100644
index 62cd345..0000000
--- a/tests/mic_cases/test-armv7hl_raw_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --arch=armv7hl --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ch_h/conf.p b/tests/mic_cases/test-ch_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ch_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ch_h/expect b/tests/mic_cases/test-ch_h/expect
deleted file mode 100644
index d7358f8..0000000
--- a/tests/mic_cases/test-ch_h/expect
+++ /dev/null
@@ -1,9 +0,0 @@
-chroot (ch): chroot into an image
-
-Usage:
- mic chroot <imagefile>
-
-Options:
- -h, --help show this help message and exit
- -s SAVETO, --saveto=SAVETO
- Save the unpacked image to specified dir \ No newline at end of file
diff --git a/tests/mic_cases/test-ch_h/ks.p b/tests/mic_cases/test-ch_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ch_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ch_h/options b/tests/mic_cases/test-ch_h/options
deleted file mode 100644
index 33a8332..0000000
--- a/tests/mic_cases/test-ch_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic ch -h
diff --git a/tests/mic_cases/test-ch_help/conf.p b/tests/mic_cases/test-ch_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ch_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ch_help/expect b/tests/mic_cases/test-ch_help/expect
deleted file mode 100644
index d7358f8..0000000
--- a/tests/mic_cases/test-ch_help/expect
+++ /dev/null
@@ -1,9 +0,0 @@
-chroot (ch): chroot into an image
-
-Usage:
- mic chroot <imagefile>
-
-Options:
- -h, --help show this help message and exit
- -s SAVETO, --saveto=SAVETO
- Save the unpacked image to specified dir \ No newline at end of file
diff --git a/tests/mic_cases/test-ch_help/ks.p b/tests/mic_cases/test-ch_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ch_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ch_help/options b/tests/mic_cases/test-ch_help/options
deleted file mode 100644
index 131d7ed..0000000
--- a/tests/mic_cases/test-ch_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic ch --help
diff --git a/tests/mic_cases/test-chroot_h/conf.p b/tests/mic_cases/test-chroot_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-chroot_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-chroot_h/expect b/tests/mic_cases/test-chroot_h/expect
deleted file mode 100644
index d7358f8..0000000
--- a/tests/mic_cases/test-chroot_h/expect
+++ /dev/null
@@ -1,9 +0,0 @@
-chroot (ch): chroot into an image
-
-Usage:
- mic chroot <imagefile>
-
-Options:
- -h, --help show this help message and exit
- -s SAVETO, --saveto=SAVETO
- Save the unpacked image to specified dir \ No newline at end of file
diff --git a/tests/mic_cases/test-chroot_h/ks.p b/tests/mic_cases/test-chroot_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-chroot_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-chroot_h/options b/tests/mic_cases/test-chroot_h/options
deleted file mode 100644
index 4490473..0000000
--- a/tests/mic_cases/test-chroot_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic chroot -h
diff --git a/tests/mic_cases/test-chroot_help/conf.p b/tests/mic_cases/test-chroot_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-chroot_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-chroot_help/expect b/tests/mic_cases/test-chroot_help/expect
deleted file mode 100644
index d7358f8..0000000
--- a/tests/mic_cases/test-chroot_help/expect
+++ /dev/null
@@ -1,9 +0,0 @@
-chroot (ch): chroot into an image
-
-Usage:
- mic chroot <imagefile>
-
-Options:
- -h, --help show this help message and exit
- -s SAVETO, --saveto=SAVETO
- Save the unpacked image to specified dir \ No newline at end of file
diff --git a/tests/mic_cases/test-chroot_help/ks.p b/tests/mic_cases/test-chroot_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-chroot_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-chroot_help/options b/tests/mic_cases/test-chroot_help/options
deleted file mode 100644
index 349e4af..0000000
--- a/tests/mic_cases/test-chroot_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic chroot --help
diff --git a/tests/mic_cases/test-convert_h/conf.p b/tests/mic_cases/test-convert_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-convert_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-convert_h/expect b/tests/mic_cases/test-convert_h/expect
deleted file mode 100644
index 19445c1..0000000
--- a/tests/mic_cases/test-convert_h/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-convert (cv): convert image format
-
-Usage:
- mic convert <imagefile> <destformat>
-
-Options:
- -h, --help show this help message and exit
- -S, --shell Launch shell before packaging the converted image \ No newline at end of file
diff --git a/tests/mic_cases/test-convert_h/ks.p b/tests/mic_cases/test-convert_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-convert_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-convert_h/options b/tests/mic_cases/test-convert_h/options
deleted file mode 100644
index 198abdf..0000000
--- a/tests/mic_cases/test-convert_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic convert -h
diff --git a/tests/mic_cases/test-convert_help/conf.p b/tests/mic_cases/test-convert_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-convert_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-convert_help/expect b/tests/mic_cases/test-convert_help/expect
deleted file mode 100644
index 19445c1..0000000
--- a/tests/mic_cases/test-convert_help/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-convert (cv): convert image format
-
-Usage:
- mic convert <imagefile> <destformat>
-
-Options:
- -h, --help show this help message and exit
- -S, --shell Launch shell before packaging the converted image \ No newline at end of file
diff --git a/tests/mic_cases/test-convert_help/ks.p b/tests/mic_cases/test-convert_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-convert_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-convert_help/options b/tests/mic_cases/test-convert_help/options
deleted file mode 100644
index a3467ec..0000000
--- a/tests/mic_cases/test-convert_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic convert --help
diff --git a/tests/mic_cases/test-cr_fs_h/conf.p b/tests/mic_cases/test-cr_fs_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_fs_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_fs_h/expect b/tests/mic_cases/test-cr_fs_h/expect
deleted file mode 100644
index 874e446..0000000
--- a/tests/mic_cases/test-cr_fs_h/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-fs: create fs image
-
-Usage:
- mic create(cr) fs <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --include-src Generate a image with source rpms included \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_fs_h/ks.p b/tests/mic_cases/test-cr_fs_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_fs_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_fs_h/options b/tests/mic_cases/test-cr_fs_h/options
deleted file mode 100644
index 9dffbb2..0000000
--- a/tests/mic_cases/test-cr_fs_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --h
diff --git a/tests/mic_cases/test-cr_fs_help/conf.p b/tests/mic_cases/test-cr_fs_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_fs_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_fs_help/expect b/tests/mic_cases/test-cr_fs_help/expect
deleted file mode 100644
index 874e446..0000000
--- a/tests/mic_cases/test-cr_fs_help/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-fs: create fs image
-
-Usage:
- mic create(cr) fs <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --include-src Generate a image with source rpms included \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_fs_help/ks.p b/tests/mic_cases/test-cr_fs_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_fs_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_fs_help/options b/tests/mic_cases/test-cr_fs_help/options
deleted file mode 100644
index 06e6cd8..0000000
--- a/tests/mic_cases/test-cr_fs_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --help
diff --git a/tests/mic_cases/test-cr_h/conf.p b/tests/mic_cases/test-cr_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_h/expect b/tests/mic_cases/test-cr_h/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-cr_h/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_h/ks.p b/tests/mic_cases/test-cr_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_h/options b/tests/mic_cases/test-cr_h/options
deleted file mode 100644
index f490284..0000000
--- a/tests/mic_cases/test-cr_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr -h
diff --git a/tests/mic_cases/test-cr_help/conf.p b/tests/mic_cases/test-cr_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help/expect b/tests/mic_cases/test-cr_help/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-cr_help/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_help/ks.p b/tests/mic_cases/test-cr_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help/options b/tests/mic_cases/test-cr_help/options
deleted file mode 100644
index f7ff080..0000000
--- a/tests/mic_cases/test-cr_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr help
diff --git a/tests/mic_cases/test-cr_help_2line/conf.p b/tests/mic_cases/test-cr_help_2line/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help_2line/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help_2line/expect b/tests/mic_cases/test-cr_help_2line/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-cr_help_2line/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_help_2line/ks.p b/tests/mic_cases/test-cr_help_2line/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help_2line/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help_2line/options b/tests/mic_cases/test-cr_help_2line/options
deleted file mode 100644
index a905f8b..0000000
--- a/tests/mic_cases/test-cr_help_2line/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr --help
diff --git a/tests/mic_cases/test-cr_help_mark/conf.p b/tests/mic_cases/test-cr_help_mark/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help_mark/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help_mark/expect b/tests/mic_cases/test-cr_help_mark/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-cr_help_mark/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_help_mark/ks.p b/tests/mic_cases/test-cr_help_mark/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_help_mark/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_help_mark/options b/tests/mic_cases/test-cr_help_mark/options
deleted file mode 100644
index 865f64b..0000000
--- a/tests/mic_cases/test-cr_help_mark/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr ?
diff --git a/tests/mic_cases/test-cr_livecd_h/conf.p b/tests/mic_cases/test-cr_livecd_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_livecd_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_livecd_h/expect b/tests/mic_cases/test-cr_livecd_h/expect
deleted file mode 100644
index 4b8cedc..0000000
--- a/tests/mic_cases/test-cr_livecd_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-livecd: create livecd image
-
-Usage:
- mic create(cr) livecd <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_livecd_h/ks.p b/tests/mic_cases/test-cr_livecd_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_livecd_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_livecd_h/options b/tests/mic_cases/test-cr_livecd_h/options
deleted file mode 100644
index f0e4591..0000000
--- a/tests/mic_cases/test-cr_livecd_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd -h
diff --git a/tests/mic_cases/test-cr_livecd_help/conf.p b/tests/mic_cases/test-cr_livecd_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_livecd_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_livecd_help/expect b/tests/mic_cases/test-cr_livecd_help/expect
deleted file mode 100644
index 4b8cedc..0000000
--- a/tests/mic_cases/test-cr_livecd_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-livecd: create livecd image
-
-Usage:
- mic create(cr) livecd <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_livecd_help/ks.p b/tests/mic_cases/test-cr_livecd_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_livecd_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_livecd_help/options b/tests/mic_cases/test-cr_livecd_help/options
deleted file mode 100644
index 64d920b..0000000
--- a/tests/mic_cases/test-cr_livecd_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --help
diff --git a/tests/mic_cases/test-cr_liveusb_h/conf.p b/tests/mic_cases/test-cr_liveusb_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_liveusb_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_liveusb_h/expect b/tests/mic_cases/test-cr_liveusb_h/expect
deleted file mode 100644
index 76fbe5d..0000000
--- a/tests/mic_cases/test-cr_liveusb_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-liveusb: create liveusb image
-
-Usage:
- mic create(cr) liveusb <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_liveusb_h/ks.p b/tests/mic_cases/test-cr_liveusb_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_liveusb_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_liveusb_h/options b/tests/mic_cases/test-cr_liveusb_h/options
deleted file mode 100644
index 2a9bb37..0000000
--- a/tests/mic_cases/test-cr_liveusb_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr liveusb --h
diff --git a/tests/mic_cases/test-cr_liveusb_help/conf.p b/tests/mic_cases/test-cr_liveusb_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_liveusb_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_liveusb_help/expect b/tests/mic_cases/test-cr_liveusb_help/expect
deleted file mode 100644
index 76fbe5d..0000000
--- a/tests/mic_cases/test-cr_liveusb_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-liveusb: create liveusb image
-
-Usage:
- mic create(cr) liveusb <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_liveusb_help/ks.p b/tests/mic_cases/test-cr_liveusb_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_liveusb_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_liveusb_help/options b/tests/mic_cases/test-cr_liveusb_help/options
deleted file mode 100644
index d8bc885..0000000
--- a/tests/mic_cases/test-cr_liveusb_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr liveusb --help
diff --git a/tests/mic_cases/test-cr_loop_h/conf.p b/tests/mic_cases/test-cr_loop_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_loop_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_loop_h/expect b/tests/mic_cases/test-cr_loop_h/expect
deleted file mode 100644
index 6f82a36..0000000
--- a/tests/mic_cases/test-cr_loop_h/expect
+++ /dev/null
@@ -1,10 +0,0 @@
-loop: create loop image
-
-Usage:
- mic create(cr) loop <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --taring-to=TARING_TO
- Specify the filename for packaging all loop images
- into a single tarball \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_loop_h/ks.p b/tests/mic_cases/test-cr_loop_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_loop_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_loop_h/options b/tests/mic_cases/test-cr_loop_h/options
deleted file mode 100644
index c01833b..0000000
--- a/tests/mic_cases/test-cr_loop_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop -h
diff --git a/tests/mic_cases/test-cr_loop_help/conf.p b/tests/mic_cases/test-cr_loop_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_loop_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_loop_help/expect b/tests/mic_cases/test-cr_loop_help/expect
deleted file mode 100644
index 6f82a36..0000000
--- a/tests/mic_cases/test-cr_loop_help/expect
+++ /dev/null
@@ -1,10 +0,0 @@
-loop: create loop image
-
-Usage:
- mic create(cr) loop <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --taring-to=TARING_TO
- Specify the filename for packaging all loop images
- into a single tarball \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_loop_help/ks.p b/tests/mic_cases/test-cr_loop_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_loop_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_loop_help/options b/tests/mic_cases/test-cr_loop_help/options
deleted file mode 100644
index f2ae2da..0000000
--- a/tests/mic_cases/test-cr_loop_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --help
diff --git a/tests/mic_cases/test-cr_raw_h/conf.p b/tests/mic_cases/test-cr_raw_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_raw_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_raw_h/expect b/tests/mic_cases/test-cr_raw_h/expect
deleted file mode 100644
index 458efd8..0000000
--- a/tests/mic_cases/test-cr_raw_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-raw: create raw image
-
-Usage:
- mic create(cr) raw <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_raw_h/ks.p b/tests/mic_cases/test-cr_raw_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_raw_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_raw_h/options b/tests/mic_cases/test-cr_raw_h/options
deleted file mode 100644
index 370e0a7..0000000
--- a/tests/mic_cases/test-cr_raw_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw -h
diff --git a/tests/mic_cases/test-cr_raw_help/conf.p b/tests/mic_cases/test-cr_raw_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_raw_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_raw_help/expect b/tests/mic_cases/test-cr_raw_help/expect
deleted file mode 100644
index 458efd8..0000000
--- a/tests/mic_cases/test-cr_raw_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-raw: create raw image
-
-Usage:
- mic create(cr) raw <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-cr_raw_help/ks.p b/tests/mic_cases/test-cr_raw_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cr_raw_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cr_raw_help/options b/tests/mic_cases/test-cr_raw_help/options
deleted file mode 100644
index 65ba7d4..0000000
--- a/tests/mic_cases/test-cr_raw_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --help
diff --git a/tests/mic_cases/test-create_fs_h/conf.p b/tests/mic_cases/test-create_fs_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_fs_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_fs_h/expect b/tests/mic_cases/test-create_fs_h/expect
deleted file mode 100644
index 874e446..0000000
--- a/tests/mic_cases/test-create_fs_h/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-fs: create fs image
-
-Usage:
- mic create(cr) fs <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --include-src Generate a image with source rpms included \ No newline at end of file
diff --git a/tests/mic_cases/test-create_fs_h/ks.p b/tests/mic_cases/test-create_fs_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_fs_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_fs_h/options b/tests/mic_cases/test-create_fs_h/options
deleted file mode 100644
index 33ff0bf..0000000
--- a/tests/mic_cases/test-create_fs_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --h
diff --git a/tests/mic_cases/test-create_fs_help/conf.p b/tests/mic_cases/test-create_fs_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_fs_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_fs_help/expect b/tests/mic_cases/test-create_fs_help/expect
deleted file mode 100644
index 874e446..0000000
--- a/tests/mic_cases/test-create_fs_help/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-fs: create fs image
-
-Usage:
- mic create(cr) fs <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --include-src Generate a image with source rpms included \ No newline at end of file
diff --git a/tests/mic_cases/test-create_fs_help/ks.p b/tests/mic_cases/test-create_fs_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_fs_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_fs_help/options b/tests/mic_cases/test-create_fs_help/options
deleted file mode 100644
index b8382b4..0000000
--- a/tests/mic_cases/test-create_fs_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --help
diff --git a/tests/mic_cases/test-create_h/conf.p b/tests/mic_cases/test-create_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_h/expect b/tests/mic_cases/test-create_h/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-create_h/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-create_h/ks.p b/tests/mic_cases/test-create_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_h/options b/tests/mic_cases/test-create_h/options
deleted file mode 100644
index 9e5d718..0000000
--- a/tests/mic_cases/test-create_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create -h
diff --git a/tests/mic_cases/test-create_help/conf.p b/tests/mic_cases/test-create_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help/expect b/tests/mic_cases/test-create_help/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-create_help/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-create_help/ks.p b/tests/mic_cases/test-create_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help/options b/tests/mic_cases/test-create_help/options
deleted file mode 100644
index 8691ba6..0000000
--- a/tests/mic_cases/test-create_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create help
diff --git a/tests/mic_cases/test-create_help_2line/conf.p b/tests/mic_cases/test-create_help_2line/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help_2line/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help_2line/expect b/tests/mic_cases/test-create_help_2line/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-create_help_2line/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-create_help_2line/ks.p b/tests/mic_cases/test-create_help_2line/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help_2line/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help_2line/options b/tests/mic_cases/test-create_help_2line/options
deleted file mode 100644
index 77d34d7..0000000
--- a/tests/mic_cases/test-create_help_2line/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create --help
diff --git a/tests/mic_cases/test-create_help_mark/conf.p b/tests/mic_cases/test-create_help_mark/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help_mark/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help_mark/expect b/tests/mic_cases/test-create_help_mark/expect
deleted file mode 100644
index 8586d08..0000000
--- a/tests/mic_cases/test-create_help_mark/expect
+++ /dev/null
@@ -1,40 +0,0 @@
-mic create(cr): create an image
-
-Usage:
- mic create(cr) SUBCOMMAND <ksfile> [OPTS]
-
-Commands:
- fs create fs image
- help (?) give detailed help on a specific sub-command
- livecd create livecd image
- liveusb create liveusb image
- loop create loop image
- raw create raw image
-
-Options:
- -h, --help show this help message and exit
- --logfile=LOGFILE Path of logfile
- -c CONFIG, --config=CONFIG
- Specify config file for mic
- -k CACHEDIR, --cachedir=CACHEDIR
- Cache directory to store the downloaded
- -o OUTDIR, --outdir=OUTDIR
- Output directory
- -A ARCH, --arch=ARCH
- Specify repo architecture
- --release=RID Generate a release of RID with all necessary files,
- when @BUILD_ID@ is contained in kickstart file, it
- will be replaced by RID
- --record-pkgs=RECORD_PKGS
- Record the info of installed packages, multiple values
- can be specified which joined by ",", valid values:
- "name", "content", "license"
- --pkgmgr=PKGMGR Specify backend package manager
- --local-pkgs-path=LOCAL_PKGS_PATH
- Path for local pkgs(rpms) to be installed
- --runtime=RUNTIME Specify runtime mode, avaiable: bootstrap
- --compress-disk-image=COMPRESS_DISK_IMAGE
- Sets the disk image compression. NOTE: The available
- values might depend on the used filesystem type.
- --copy-kernel Copy kernel files from image /boot directory to the
- image output directory. \ No newline at end of file
diff --git a/tests/mic_cases/test-create_help_mark/ks.p b/tests/mic_cases/test-create_help_mark/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_help_mark/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_help_mark/options b/tests/mic_cases/test-create_help_mark/options
deleted file mode 100644
index ea14bd0..0000000
--- a/tests/mic_cases/test-create_help_mark/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create ?
diff --git a/tests/mic_cases/test-create_livecd_h/conf.p b/tests/mic_cases/test-create_livecd_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_livecd_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_livecd_h/expect b/tests/mic_cases/test-create_livecd_h/expect
deleted file mode 100644
index 4b8cedc..0000000
--- a/tests/mic_cases/test-create_livecd_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-livecd: create livecd image
-
-Usage:
- mic create(cr) livecd <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_livecd_h/ks.p b/tests/mic_cases/test-create_livecd_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_livecd_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_livecd_h/options b/tests/mic_cases/test-create_livecd_h/options
deleted file mode 100644
index 9770353..0000000
--- a/tests/mic_cases/test-create_livecd_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create livecd -h
diff --git a/tests/mic_cases/test-create_livecd_help/conf.p b/tests/mic_cases/test-create_livecd_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_livecd_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_livecd_help/expect b/tests/mic_cases/test-create_livecd_help/expect
deleted file mode 100644
index 4b8cedc..0000000
--- a/tests/mic_cases/test-create_livecd_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-livecd: create livecd image
-
-Usage:
- mic create(cr) livecd <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_livecd_help/ks.p b/tests/mic_cases/test-create_livecd_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_livecd_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_livecd_help/options b/tests/mic_cases/test-create_livecd_help/options
deleted file mode 100644
index 9692988..0000000
--- a/tests/mic_cases/test-create_livecd_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create livecd --help
diff --git a/tests/mic_cases/test-create_liveusb_h/conf.p b/tests/mic_cases/test-create_liveusb_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_liveusb_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_liveusb_h/expect b/tests/mic_cases/test-create_liveusb_h/expect
deleted file mode 100644
index 76fbe5d..0000000
--- a/tests/mic_cases/test-create_liveusb_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-liveusb: create liveusb image
-
-Usage:
- mic create(cr) liveusb <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_liveusb_h/ks.p b/tests/mic_cases/test-create_liveusb_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_liveusb_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_liveusb_h/options b/tests/mic_cases/test-create_liveusb_h/options
deleted file mode 100644
index ee31109..0000000
--- a/tests/mic_cases/test-create_liveusb_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --h
diff --git a/tests/mic_cases/test-create_liveusb_help/conf.p b/tests/mic_cases/test-create_liveusb_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_liveusb_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_liveusb_help/expect b/tests/mic_cases/test-create_liveusb_help/expect
deleted file mode 100644
index 76fbe5d..0000000
--- a/tests/mic_cases/test-create_liveusb_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-liveusb: create liveusb image
-
-Usage:
- mic create(cr) liveusb <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_liveusb_help/ks.p b/tests/mic_cases/test-create_liveusb_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_liveusb_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_liveusb_help/options b/tests/mic_cases/test-create_liveusb_help/options
deleted file mode 100644
index 337b8d3..0000000
--- a/tests/mic_cases/test-create_liveusb_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --help
diff --git a/tests/mic_cases/test-create_loop_h/conf.p b/tests/mic_cases/test-create_loop_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_loop_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_loop_h/expect b/tests/mic_cases/test-create_loop_h/expect
deleted file mode 100644
index 6f82a36..0000000
--- a/tests/mic_cases/test-create_loop_h/expect
+++ /dev/null
@@ -1,10 +0,0 @@
-loop: create loop image
-
-Usage:
- mic create(cr) loop <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --taring-to=TARING_TO
- Specify the filename for packaging all loop images
- into a single tarball \ No newline at end of file
diff --git a/tests/mic_cases/test-create_loop_h/ks.p b/tests/mic_cases/test-create_loop_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_loop_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_loop_h/options b/tests/mic_cases/test-create_loop_h/options
deleted file mode 100644
index 7776ad9..0000000
--- a/tests/mic_cases/test-create_loop_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create loop -h
diff --git a/tests/mic_cases/test-create_loop_help/conf.p b/tests/mic_cases/test-create_loop_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_loop_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_loop_help/expect b/tests/mic_cases/test-create_loop_help/expect
deleted file mode 100644
index 6f82a36..0000000
--- a/tests/mic_cases/test-create_loop_help/expect
+++ /dev/null
@@ -1,10 +0,0 @@
-loop: create loop image
-
-Usage:
- mic create(cr) loop <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit
- --taring-to=TARING_TO
- Specify the filename for packaging all loop images
- into a single tarball \ No newline at end of file
diff --git a/tests/mic_cases/test-create_loop_help/ks.p b/tests/mic_cases/test-create_loop_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_loop_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_loop_help/options b/tests/mic_cases/test-create_loop_help/options
deleted file mode 100644
index 92cf4a3..0000000
--- a/tests/mic_cases/test-create_loop_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create loop --help
diff --git a/tests/mic_cases/test-create_raw_h/conf.p b/tests/mic_cases/test-create_raw_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_raw_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_raw_h/expect b/tests/mic_cases/test-create_raw_h/expect
deleted file mode 100644
index 458efd8..0000000
--- a/tests/mic_cases/test-create_raw_h/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-raw: create raw image
-
-Usage:
- mic create(cr) raw <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_raw_h/ks.p b/tests/mic_cases/test-create_raw_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_raw_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_raw_h/options b/tests/mic_cases/test-create_raw_h/options
deleted file mode 100644
index fed002b..0000000
--- a/tests/mic_cases/test-create_raw_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create raw -h
diff --git a/tests/mic_cases/test-create_raw_help/conf.p b/tests/mic_cases/test-create_raw_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_raw_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_raw_help/expect b/tests/mic_cases/test-create_raw_help/expect
deleted file mode 100644
index 458efd8..0000000
--- a/tests/mic_cases/test-create_raw_help/expect
+++ /dev/null
@@ -1,7 +0,0 @@
-raw: create raw image
-
-Usage:
- mic create(cr) raw <ksfile> [OPTS]
-
-Options:
- -h, --help show this help message and exit \ No newline at end of file
diff --git a/tests/mic_cases/test-create_raw_help/ks.p b/tests/mic_cases/test-create_raw_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-create_raw_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-create_raw_help/options b/tests/mic_cases/test-create_raw_help/options
deleted file mode 100644
index 8b966d3..0000000
--- a/tests/mic_cases/test-create_raw_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create raw --help
diff --git a/tests/mic_cases/test-cv_h/conf.p b/tests/mic_cases/test-cv_h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cv_h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cv_h/expect b/tests/mic_cases/test-cv_h/expect
deleted file mode 100644
index 19445c1..0000000
--- a/tests/mic_cases/test-cv_h/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-convert (cv): convert image format
-
-Usage:
- mic convert <imagefile> <destformat>
-
-Options:
- -h, --help show this help message and exit
- -S, --shell Launch shell before packaging the converted image \ No newline at end of file
diff --git a/tests/mic_cases/test-cv_h/ks.p b/tests/mic_cases/test-cv_h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cv_h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cv_h/options b/tests/mic_cases/test-cv_h/options
deleted file mode 100644
index 6ec0cdc..0000000
--- a/tests/mic_cases/test-cv_h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cv -h
diff --git a/tests/mic_cases/test-cv_help/conf.p b/tests/mic_cases/test-cv_help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cv_help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cv_help/expect b/tests/mic_cases/test-cv_help/expect
deleted file mode 100644
index 19445c1..0000000
--- a/tests/mic_cases/test-cv_help/expect
+++ /dev/null
@@ -1,8 +0,0 @@
-convert (cv): convert image format
-
-Usage:
- mic convert <imagefile> <destformat>
-
-Options:
- -h, --help show this help message and exit
- -S, --shell Launch shell before packaging the converted image \ No newline at end of file
diff --git a/tests/mic_cases/test-cv_help/ks.p b/tests/mic_cases/test-cv_help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-cv_help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-cv_help/options b/tests/mic_cases/test-cv_help/options
deleted file mode 100644
index cb2ab05..0000000
--- a/tests/mic_cases/test-cv_help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cv --help
diff --git a/tests/mic_cases/test-h/conf.p b/tests/mic_cases/test-h/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-h/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-h/expect b/tests/mic_cases/test-h/expect
deleted file mode 100644
index edb6fe7..0000000
--- a/tests/mic_cases/test-h/expect
+++ /dev/null
@@ -1,16 +0,0 @@
-Usage: mic SUBCOMMAND [OPTS] [ARGS...]
-
-mic Means the Image Creation tool
-Try 'mic help SUBCOMMAND' for help on a specific subcommand.
-
-Commands:
- chroot (ch) chroot into an image
- convert (cv) convert image format
- create (cr) create an image
- help (?) give detailed help on a specific sub-command
-
-global Options:
- --version show program's version number and exit
- -h, --help show this help message and exit
- -d, --debug print debug message
- -v, --verbose verbose information \ No newline at end of file
diff --git a/tests/mic_cases/test-h/ks.p b/tests/mic_cases/test-h/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-h/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-h/options b/tests/mic_cases/test-h/options
deleted file mode 100644
index debd604..0000000
--- a/tests/mic_cases/test-h/options
+++ /dev/null
@@ -1 +0,0 @@
-mic -h
diff --git a/tests/mic_cases/test-help/conf.p b/tests/mic_cases/test-help/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-help/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-help/expect b/tests/mic_cases/test-help/expect
deleted file mode 100644
index edb6fe7..0000000
--- a/tests/mic_cases/test-help/expect
+++ /dev/null
@@ -1,16 +0,0 @@
-Usage: mic SUBCOMMAND [OPTS] [ARGS...]
-
-mic Means the Image Creation tool
-Try 'mic help SUBCOMMAND' for help on a specific subcommand.
-
-Commands:
- chroot (ch) chroot into an image
- convert (cv) convert image format
- create (cr) create an image
- help (?) give detailed help on a specific sub-command
-
-global Options:
- --version show program's version number and exit
- -h, --help show this help message and exit
- -d, --debug print debug message
- -v, --verbose verbose information \ No newline at end of file
diff --git a/tests/mic_cases/test-help/ks.p b/tests/mic_cases/test-help/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-help/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-help/options b/tests/mic_cases/test-help/options
deleted file mode 100644
index b4f8b44..0000000
--- a/tests/mic_cases/test-help/options
+++ /dev/null
@@ -1 +0,0 @@
-mic --help
diff --git a/tests/mic_cases/test-help_mark/conf.p b/tests/mic_cases/test-help_mark/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-help_mark/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-help_mark/expect b/tests/mic_cases/test-help_mark/expect
deleted file mode 100644
index edb6fe7..0000000
--- a/tests/mic_cases/test-help_mark/expect
+++ /dev/null
@@ -1,16 +0,0 @@
-Usage: mic SUBCOMMAND [OPTS] [ARGS...]
-
-mic Means the Image Creation tool
-Try 'mic help SUBCOMMAND' for help on a specific subcommand.
-
-Commands:
- chroot (ch) chroot into an image
- convert (cv) convert image format
- create (cr) create an image
- help (?) give detailed help on a specific sub-command
-
-global Options:
- --version show program's version number and exit
- -h, --help show this help message and exit
- -d, --debug print debug message
- -v, --verbose verbose information \ No newline at end of file
diff --git a/tests/mic_cases/test-help_mark/ks.p b/tests/mic_cases/test-help_mark/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-help_mark/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-help_mark/options b/tests/mic_cases/test-help_mark/options
deleted file mode 100644
index fbb72a7..0000000
--- a/tests/mic_cases/test-help_mark/options
+++ /dev/null
@@ -1 +0,0 @@
-mic ?
diff --git a/tests/mic_cases/test-ia32_fs_include_yum/conf.p b/tests/mic_cases/test-ia32_fs_include_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_include_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_include_yum/ks.p b/tests/mic_cases/test-ia32_fs_include_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_include_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_include_yum/options b/tests/mic_cases/test-ia32_fs_include_yum/options
deleted file mode 100644
index b0bc557..0000000
--- a/tests/mic_cases/test-ia32_fs_include_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --pkgmgr=yum --include-src
diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/conf.p b/tests/mic_cases/test-ia32_fs_include_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_include_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/ks.p b/tests/mic_cases/test-ia32_fs_include_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_include_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/options b/tests/mic_cases/test-ia32_fs_include_zypp/options
deleted file mode 100644
index 1f84f61..0000000
--- a/tests/mic_cases/test-ia32_fs_include_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --pkgmgr=zypp --include-src
diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p b/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p b/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/options b/tests/mic_cases/test-ia32_fs_outdir_release_yum/options
deleted file mode 100644
index dd41633..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_release_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --pkgmgr=yum --outdir=outdir3 --release=XXX
diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p b/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p b/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/options b/tests/mic_cases/test-ia32_fs_outdir_zypp/options
deleted file mode 100644
index b38ad75..0000000
--- a/tests/mic_cases/test-ia32_fs_outdir_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create fs --pkgmgr=zypp -o outdir1
diff --git a/tests/mic_cases/test-ia32_fs_record_yum/conf.p b/tests/mic_cases/test-ia32_fs_record_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_record_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_record_yum/ks.p b/tests/mic_cases/test-ia32_fs_record_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_record_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_record_yum/options b/tests/mic_cases/test-ia32_fs_record_yum/options
deleted file mode 100644
index e1f90c1..0000000
--- a/tests/mic_cases/test-ia32_fs_record_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --pkgmgr=yum --record-pkgs=name,license
diff --git a/tests/mic_cases/test-ia32_fs_yum/conf.p b/tests/mic_cases/test-ia32_fs_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_yum/ks.p b/tests/mic_cases/test-ia32_fs_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_yum/options b/tests/mic_cases/test-ia32_fs_yum/options
deleted file mode 100644
index 53eb1fe..0000000
--- a/tests/mic_cases/test-ia32_fs_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_fs_zypp/conf.p b/tests/mic_cases/test-ia32_fs_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_zypp/ks.p b/tests/mic_cases/test-ia32_fs_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_fs_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_fs_zypp/options b/tests/mic_cases/test-ia32_fs_zypp/options
deleted file mode 100644
index d9cce8c..0000000
--- a/tests/mic_cases/test-ia32_fs_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr fs --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/options b/tests/mic_cases/test-ia32_livecd_log_zypp/options
deleted file mode 100644
index cbb522f..0000000
--- a/tests/mic_cases/test-ia32_livecd_log_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create livecd --pkgmgr=zypp --logfile=logfile1
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p b/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p b/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/options b/tests/mic_cases/test-ia32_livecd_pkgs_yum/options
deleted file mode 100644
index afc3f8f..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create livecd --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options
deleted file mode 100644
index 21047b3..0000000
--- a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create livecd --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options
deleted file mode 100644
index 20fb9b6..0000000
--- a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=yum --release=XXX
diff --git a/tests/mic_cases/test-ia32_livecd_yum/conf.p b/tests/mic_cases/test-ia32_livecd_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_yum/ks.p b/tests/mic_cases/test-ia32_livecd_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_yum/options b/tests/mic_cases/test-ia32_livecd_yum/options
deleted file mode 100644
index 8898d69..0000000
--- a/tests/mic_cases/test-ia32_livecd_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_livecd_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_livecd_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_livecd_zypp/options b/tests/mic_cases/test-ia32_livecd_zypp/options
deleted file mode 100644
index 5740466..0000000
--- a/tests/mic_cases/test-ia32_livecd_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/options b/tests/mic_cases/test-ia32_liveusb_log_record_yum/options
deleted file mode 100644
index 6840984..0000000
--- a/tests/mic_cases/test-ia32_liveusb_log_record_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr liveusb --pkgmgr=yum --logfile=logfile4 --record-pkgs=name,license
diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options
deleted file mode 100644
index 9d3037f..0000000
--- a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr liveusb --pkgmgr=yum -o outdir5
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/options b/tests/mic_cases/test-ia32_liveusb_pkgs_a/options
deleted file mode 100644
index b36a349..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --pkgmgr=zypp -A i686
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options
deleted file mode 100644
index b36a349..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --pkgmgr=zypp -A i686
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options
deleted file mode 100644
index 4822a6e..0000000
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/options b/tests/mic_cases/test-ia32_liveusb_record_zypp/options
deleted file mode 100644
index 71d0c5e..0000000
--- a/tests/mic_cases/test-ia32_liveusb_record_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create liveusb --pkgmgr=zypp -A i686
diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options
deleted file mode 100644
index 6d05843..0000000
--- a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=yum --release=XXX
diff --git a/tests/mic_cases/test-ia32_liveusb_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_yum/options b/tests/mic_cases/test-ia32_liveusb_yum/options
deleted file mode 100644
index def4228..0000000
--- a/tests/mic_cases/test-ia32_liveusb_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_liveusb_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/options b/tests/mic_cases/test-ia32_liveusb_zypp/options
deleted file mode 100644
index b87abb1..0000000
--- a/tests/mic_cases/test-ia32_liveusb_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr livecd --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p b/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p b/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/options b/tests/mic_cases/test-ia32_loop_o_log_yum/options
deleted file mode 100644
index 61f11ad..0000000
--- a/tests/mic_cases/test-ia32_loop_o_log_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --pkgmgr=yum --release=XXX --logfile=logfile3
diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/conf.p b/tests/mic_cases/test-ia32_loop_release_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_release_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/ks.p b/tests/mic_cases/test-ia32_loop_release_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_release_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/options b/tests/mic_cases/test-ia32_loop_release_zypp/options
deleted file mode 100644
index 31c2419..0000000
--- a/tests/mic_cases/test-ia32_loop_release_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create loop --pkgmgr=zypp --release=XXX
diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/conf.p b/tests/mic_cases/test-ia32_loop_taring_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/ks.p b/tests/mic_cases/test-ia32_loop_taring_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/options b/tests/mic_cases/test-ia32_loop_taring_yum/options
deleted file mode 100644
index 5023a63..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --pkgmgr=yum --taring-to=XXX
diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p b/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p b/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/options b/tests/mic_cases/test-ia32_loop_taring_zypp/options
deleted file mode 100644
index 8f0429e..0000000
--- a/tests/mic_cases/test-ia32_loop_taring_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create loop --pkgmgr=zypp --taring-to=XXX
diff --git a/tests/mic_cases/test-ia32_loop_yum/conf.p b/tests/mic_cases/test-ia32_loop_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_yum/ks.p b/tests/mic_cases/test-ia32_loop_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_yum/options b/tests/mic_cases/test-ia32_loop_yum/options
deleted file mode 100644
index 7af979a..0000000
--- a/tests/mic_cases/test-ia32_loop_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_loop_zypp/conf.p b/tests/mic_cases/test-ia32_loop_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_zypp/ks.p b/tests/mic_cases/test-ia32_loop_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_loop_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_loop_zypp/options b/tests/mic_cases/test-ia32_loop_zypp/options
deleted file mode 100644
index 2b2e942..0000000
--- a/tests/mic_cases/test-ia32_loop_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr loop --pkgmgr=zypp
diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options
deleted file mode 100644
index c200688..0000000
--- a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --pkgmgr=yum --outdir=outdir6 --release=XXX --logfile=logfile5 --record-pkgs=license
diff --git a/tests/mic_cases/test-ia32_raw_record/conf.p b/tests/mic_cases/test-ia32_raw_record/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_record/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_record/ks.p b/tests/mic_cases/test-ia32_raw_record/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_record/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_record/options b/tests/mic_cases/test-ia32_raw_record/options
deleted file mode 100644
index 1e478fd..0000000
--- a/tests/mic_cases/test-ia32_raw_record/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create raw --pkgmgr=zypp --record-pkgs=name
diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/conf.p b/tests/mic_cases/test-ia32_raw_record_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_record_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/ks.p b/tests/mic_cases/test-ia32_raw_record_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_record_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/options b/tests/mic_cases/test-ia32_raw_record_zypp/options
deleted file mode 100644
index 1e478fd..0000000
--- a/tests/mic_cases/test-ia32_raw_record_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic create raw --pkgmgr=zypp --record-pkgs=name
diff --git a/tests/mic_cases/test-ia32_raw_yum/conf.p b/tests/mic_cases/test-ia32_raw_yum/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_yum/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_yum/ks.p b/tests/mic_cases/test-ia32_raw_yum/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_yum/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_yum/options b/tests/mic_cases/test-ia32_raw_yum/options
deleted file mode 100644
index 4b8ad21..0000000
--- a/tests/mic_cases/test-ia32_raw_yum/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --pkgmgr=yum
diff --git a/tests/mic_cases/test-ia32_raw_zypp/conf.p b/tests/mic_cases/test-ia32_raw_zypp/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_zypp/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_zypp/ks.p b/tests/mic_cases/test-ia32_raw_zypp/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-ia32_raw_zypp/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-ia32_raw_zypp/options b/tests/mic_cases/test-ia32_raw_zypp/options
deleted file mode 100644
index ab537a3..0000000
--- a/tests/mic_cases/test-ia32_raw_zypp/options
+++ /dev/null
@@ -1 +0,0 @@
-mic cr raw --pkgmgr=zypp
diff --git a/tests/mic_cases/test-version/conf.p b/tests/mic_cases/test-version/conf.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-version/conf.p
+++ /dev/null
diff --git a/tests/mic_cases/test-version/expect b/tests/mic_cases/test-version/expect
deleted file mode 100644
index 490f510..0000000
--- a/tests/mic_cases/test-version/expect
+++ /dev/null
@@ -1 +0,0 @@
-0.6 \ No newline at end of file
diff --git a/tests/mic_cases/test-version/ks.p b/tests/mic_cases/test-version/ks.p
deleted file mode 100644
index e69de29..0000000
--- a/tests/mic_cases/test-version/ks.p
+++ /dev/null
diff --git a/tests/mic_cases/test-version/options b/tests/mic_cases/test-version/options
deleted file mode 100644
index 8aed032..0000000
--- a/tests/mic_cases/test-version/options
+++ /dev/null
@@ -1 +0,0 @@
-mic --version
diff --git a/tests/unittest/pluginmgr_fixtures/backend/yumtest.py b/tests/pluginmgr_fixtures/backend/yumtest.py
index 61ba220..61ba220 100644
--- a/tests/unittest/pluginmgr_fixtures/backend/yumtest.py
+++ b/tests/pluginmgr_fixtures/backend/yumtest.py
diff --git a/tests/unittest/pluginmgr_fixtures/backend/zypptest.py b/tests/pluginmgr_fixtures/backend/zypptest.py
index 6ebe1f3..6ebe1f3 100644
--- a/tests/unittest/pluginmgr_fixtures/backend/zypptest.py
+++ b/tests/pluginmgr_fixtures/backend/zypptest.py
diff --git a/tests/unittest/pluginmgr_fixtures/imager/fs_test.py b/tests/pluginmgr_fixtures/imager/fs_test.py
index ced1ce2..ced1ce2 100644
--- a/tests/unittest/pluginmgr_fixtures/imager/fs_test.py
+++ b/tests/pluginmgr_fixtures/imager/fs_test.py
diff --git a/tests/unittest/pluginmgr_fixtures/imager/loop_test.py b/tests/pluginmgr_fixtures/imager/loop_test.py
index 5fb515c..5fb515c 100644
--- a/tests/unittest/pluginmgr_fixtures/imager/loop_test.py
+++ b/tests/pluginmgr_fixtures/imager/loop_test.py
diff --git a/tests/unittest/suite.py b/tests/suite.py
index 7a7475d..7a7475d 100644
--- a/tests/unittest/suite.py
+++ b/tests/suite.py
diff --git a/tests/unittest/test_baseimager.py b/tests/test_baseimager.py
index 6b91b0d..6b91b0d 100644
--- a/tests/unittest/test_baseimager.py
+++ b/tests/test_baseimager.py
diff --git a/tests/unittest/test_chroot.py b/tests/test_chroot.py
index 546e3ae..546e3ae 100644
--- a/tests/unittest/test_chroot.py
+++ b/tests/test_chroot.py
diff --git a/tests/unittest/test_configmgr.py b/tests/test_configmgr.py
index fcebc9f..fcebc9f 100644
--- a/tests/unittest/test_configmgr.py
+++ b/tests/test_configmgr.py
diff --git a/tests/unittest/test_msger.py b/tests/test_msger.py
index be57b2f..be57b2f 100644
--- a/tests/unittest/test_msger.py
+++ b/tests/test_msger.py
diff --git a/tests/unittest/test_pluginmgr.py b/tests/test_pluginmgr.py
index 5c207b6..5c207b6 100644
--- a/tests/unittest/test_pluginmgr.py
+++ b/tests/test_pluginmgr.py
diff --git a/tests/unittest/test_runner.py b/tests/test_runner.py
index 5ed26cd..5ed26cd 100644
--- a/tests/unittest/test_runner.py
+++ b/tests/test_runner.py
diff --git a/tests/testbase.py b/tests/testbase.py
deleted file mode 100644
index c167384..0000000
--- a/tests/testbase.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/python
-import os
-import sys
-import subprocess, re, shutil, glob
-import gettext
-
-_ = gettext.lgettext
-COLOR_BLACK = "\033[00m"
-COLOR_RED = "\033[1;31m"
-
-PRESCRIPTS = """
-patch -s < ks.p
-patch -s < conf.p
-sudo mv /etc/mic/mic.conf /etc/mic/orig.conf
-sudo mv test.conf /etc/mic/mic.conf
-"""
-POSTSCRIPTS = """
-sudo mv -f /etc/mic/orig.conf /etc/mic/mic.conf
-"""
-
-def PrepEnv(cases_dir, case, work_env):
- """prepare working env"""
- for one in glob.glob(os.path.join(cases_dir, 'base', '*')):
- shutil.copy(one, work_env)
- for other in glob.glob(os.path.join(cases_dir, 'test-'+case, '*')):
- shutil.copy(other, work_env)
-
-def ImgCheck(work_env):
- """check image generate"""
- genImage = False
- for root, dirs, files in os.walk(work_env):
- for name in files:
- #add raw check support and XXX.tar file check support
- m = re.match(r'.*\.(img|raw|iso|usbimg|tar)', name) or re.match(r'system-release',name)
- if m:
- genImage = True
- break
- return genImage
-
-def RunandCheck(object, work_env):
- """run mic-image-creator command and check something"""
- ret = False
-
- cwd = os.getcwd()
- os.chdir(work_env)
- os.system(PRESCRIPTS)
-
- #set value of "expect"
- expect = None
- if "expect" in os.listdir(work_env):
- exp_f = open('expect', 'r')
- exp = exp_f.read()
- if len(exp) > 0:
- expect = exp.strip()
- exp_f.close()
- #set cmdline
- opt_f = open('options','r')
- mic_cmd = opt_f.read().strip()
- if mic_cmd.find('-h')!=-1 or mic_cmd.find('help')!=-1 or mic_cmd.find('?')!=-1:
- args = mic_cmd
- else:
- args = mic_cmd+' test.ks'
-
- print args
- log = open('miclog','w')
- proc = subprocess.Popen(args,stdout = log ,stderr=subprocess.PIPE,shell=True)
- errorinfo = proc.communicate()[1]
- log.close()
-
- mic_cmd_msg = None
- miclog_f = open('miclog','r')
- miclog_tuple = miclog_f.read()
- if len(miclog_tuple) > 0:
- mic_cmd_msg = miclog_tuple.strip()
- #check
- if expect:
- if errorinfo.find(expect) != -1 or mic_cmd_msg.find(expect) != -1 :#FIXME
- ret =True
- else:
- proc.wait()
- ret = ImgCheck(work_env)
- os.system(POSTSCRIPTS)
- os.chdir(cwd)
-
- try:
- object.assertTrue(ret)
- except object.failureException:
- if expect:
- ''' Used to update help expect info automaticlly.
- path = object._testMethodName
- path = path.replace('_','-',1)
- os.unlink('%s/mic_cases/%s/expect' % (cwd,path))
- fp = open('%s/mic_cases/%s/expect' % (cwd,path),'w')
- fp.write(mic_cmd_msg)
- fp.close()
- '''
- raise object.failureException(_("Expect and mic out msg are not constant\n%sExpect:%s\n\nMic out msg:%s%s") %(COLOR_RED,expect,mic_cmd_msg,COLOR_BLACK))
- else:
- raise object.failureException(_("%s%s%s") %(COLOR_RED,errorinfo,COLOR_BLACK))