test: add 40 help test case and update several system test case.

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
index ea40147..36c4efe 100644 (file)
--- 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
@@ -1 +1 @@
-mic cr fs --arch=armv7hl --config=customer.conf --pkgmgr=zypp --outdir=outdir10 --release=XXX --logfile=logfile9 --local-pkgs-path=package_armv7hl --record-pkgs=name
+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/options b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options
index 99671db..4d6441f 100644 (file)
--- a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options
+++ b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options
@@ -1 +1 @@
-mic cr fs --arch=armv7hl --pkgmgr=yum --include-src --logfile=logfile1 --local-pkgs-path=package_armv7hl 
+mic cr fs --arch=armv7hl --pkgmgr=yum --include-src --logfile=logfile1

diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options
index 02f2331..344a5cb 100644 (file)
--- a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options
+++ b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options
@@ -1 +1 @@
-mic cr loop --taring-to=XXX --local-pkgs-path=package_mixed --pkgmgr=zypp 
+mic cr loop --taring-to=XXX --pkgmgr=zypp 

diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/options b/tests/mic_cases/test-armv7hl_raw_pkg_yum/options
index d7ec036..c46b72d 100644 (file)
--- a/tests/mic_cases/test-armv7hl_raw_pkg_yum/options
+++ b/tests/mic_cases/test-armv7hl_raw_pkg_yum/options
@@ -1 +1 @@
-mic cr raw --arch=armv7hl --pkgmgr=yum --arch=armv7hl --local-pkgs-path=package_mixed 
+mic cr raw --arch=armv7hl --pkgmgr=yum --arch=armv7hl

diff --git a/tests/mic_cases/test-ch_h/conf.p b/tests/mic_cases/test-ch_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-ch_h/expect b/tests/mic_cases/test-ch_h/expect
new file mode 100644 (file)
index 0000000..d7358f8
--- /dev/null
+++ b/tests/mic_cases/test-ch_h/expect
@@ -0,0 +1,9 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-ch_h/options b/tests/mic_cases/test-ch_h/options
new file mode 100644 (file)
index 0000000..33a8332
--- /dev/null
+++ b/tests/mic_cases/test-ch_h/options
@@ -0,0 +1 @@
+mic ch -h

diff --git a/tests/mic_cases/test-ch_help/conf.p b/tests/mic_cases/test-ch_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-ch_help/expect b/tests/mic_cases/test-ch_help/expect
new file mode 100644 (file)
index 0000000..d7358f8
--- /dev/null
+++ b/tests/mic_cases/test-ch_help/expect
@@ -0,0 +1,9 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-ch_help/options b/tests/mic_cases/test-ch_help/options
new file mode 100644 (file)
index 0000000..131d7ed
--- /dev/null
+++ b/tests/mic_cases/test-ch_help/options
@@ -0,0 +1 @@
+mic ch --help

diff --git a/tests/mic_cases/test-chroot_h/conf.p b/tests/mic_cases/test-chroot_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-chroot_h/expect b/tests/mic_cases/test-chroot_h/expect
new file mode 100644 (file)
index 0000000..d7358f8
--- /dev/null
+++ b/tests/mic_cases/test-chroot_h/expect
@@ -0,0 +1,9 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-chroot_h/options b/tests/mic_cases/test-chroot_h/options
new file mode 100644 (file)
index 0000000..4490473
--- /dev/null
+++ b/tests/mic_cases/test-chroot_h/options
@@ -0,0 +1 @@
+mic chroot -h

diff --git a/tests/mic_cases/test-chroot_help/conf.p b/tests/mic_cases/test-chroot_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-chroot_help/expect b/tests/mic_cases/test-chroot_help/expect
new file mode 100644 (file)
index 0000000..d7358f8
--- /dev/null
+++ b/tests/mic_cases/test-chroot_help/expect
@@ -0,0 +1,9 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-chroot_help/options b/tests/mic_cases/test-chroot_help/options
new file mode 100644 (file)
index 0000000..349e4af
--- /dev/null
+++ b/tests/mic_cases/test-chroot_help/options
@@ -0,0 +1 @@
+mic chroot --help

diff --git a/tests/mic_cases/test-convert_h/conf.p b/tests/mic_cases/test-convert_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-convert_h/expect b/tests/mic_cases/test-convert_h/expect
new file mode 100644 (file)
index 0000000..19445c1
--- /dev/null
+++ b/tests/mic_cases/test-convert_h/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-convert_h/options b/tests/mic_cases/test-convert_h/options
new file mode 100644 (file)
index 0000000..198abdf
--- /dev/null
+++ b/tests/mic_cases/test-convert_h/options
@@ -0,0 +1 @@
+mic convert  -h

diff --git a/tests/mic_cases/test-convert_help/conf.p b/tests/mic_cases/test-convert_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-convert_help/expect b/tests/mic_cases/test-convert_help/expect
new file mode 100644 (file)
index 0000000..19445c1
--- /dev/null
+++ b/tests/mic_cases/test-convert_help/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-convert_help/options b/tests/mic_cases/test-convert_help/options
new file mode 100644 (file)
index 0000000..a3467ec
--- /dev/null
+++ b/tests/mic_cases/test-convert_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_fs_h/expect b/tests/mic_cases/test-cr_fs_h/expect
new file mode 100644 (file)
index 0000000..874e446
--- /dev/null
+++ b/tests/mic_cases/test-cr_fs_h/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_fs_h/options b/tests/mic_cases/test-cr_fs_h/options
new file mode 100644 (file)
index 0000000..9dffbb2
--- /dev/null
+++ b/tests/mic_cases/test-cr_fs_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_fs_help/expect b/tests/mic_cases/test-cr_fs_help/expect
new file mode 100644 (file)
index 0000000..874e446
--- /dev/null
+++ b/tests/mic_cases/test-cr_fs_help/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_fs_help/options b/tests/mic_cases/test-cr_fs_help/options
new file mode 100644 (file)
index 0000000..06e6cd8
--- /dev/null
+++ b/tests/mic_cases/test-cr_fs_help/options
@@ -0,0 +1 @@
+mic cr fs --help

diff --git a/tests/mic_cases/test-cr_h/conf.p b/tests/mic_cases/test-cr_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_h/expect b/tests/mic_cases/test-cr_h/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-cr_h/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_h/options b/tests/mic_cases/test-cr_h/options
new file mode 100644 (file)
index 0000000..f490284
--- /dev/null
+++ b/tests/mic_cases/test-cr_h/options
@@ -0,0 +1 @@
+mic cr -h

diff --git a/tests/mic_cases/test-cr_help/conf.p b/tests/mic_cases/test-cr_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help/expect b/tests/mic_cases/test-cr_help/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-cr_help/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help/options b/tests/mic_cases/test-cr_help/options
new file mode 100644 (file)
index 0000000..f7ff080
--- /dev/null
+++ b/tests/mic_cases/test-cr_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help_2line/expect b/tests/mic_cases/test-cr_help_2line/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-cr_help_2line/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help_2line/options b/tests/mic_cases/test-cr_help_2line/options
new file mode 100644 (file)
index 0000000..a905f8b
--- /dev/null
+++ b/tests/mic_cases/test-cr_help_2line/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help_mark/expect b/tests/mic_cases/test-cr_help_mark/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-cr_help_mark/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_help_mark/options b/tests/mic_cases/test-cr_help_mark/options
new file mode 100644 (file)
index 0000000..865f64b
--- /dev/null
+++ b/tests/mic_cases/test-cr_help_mark/options
@@ -0,0 +1 @@
+mic cr ?

diff --git a/tests/mic_cases/test-cr_livecd_h/conf.p b/tests/mic_cases/test-cr_livecd_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_livecd_h/expect b/tests/mic_cases/test-cr_livecd_h/expect
new file mode 100644 (file)
index 0000000..4b8cedc
--- /dev/null
+++ b/tests/mic_cases/test-cr_livecd_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_livecd_h/options b/tests/mic_cases/test-cr_livecd_h/options
new file mode 100644 (file)
index 0000000..f0e4591
--- /dev/null
+++ b/tests/mic_cases/test-cr_livecd_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_livecd_help/expect b/tests/mic_cases/test-cr_livecd_help/expect
new file mode 100644 (file)
index 0000000..4b8cedc
--- /dev/null
+++ b/tests/mic_cases/test-cr_livecd_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_livecd_help/options b/tests/mic_cases/test-cr_livecd_help/options
new file mode 100644 (file)
index 0000000..64d920b
--- /dev/null
+++ b/tests/mic_cases/test-cr_livecd_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_liveusb_h/expect b/tests/mic_cases/test-cr_liveusb_h/expect
new file mode 100644 (file)
index 0000000..76fbe5d
--- /dev/null
+++ b/tests/mic_cases/test-cr_liveusb_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_liveusb_h/options b/tests/mic_cases/test-cr_liveusb_h/options
new file mode 100644 (file)
index 0000000..2a9bb37
--- /dev/null
+++ b/tests/mic_cases/test-cr_liveusb_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_liveusb_help/expect b/tests/mic_cases/test-cr_liveusb_help/expect
new file mode 100644 (file)
index 0000000..76fbe5d
--- /dev/null
+++ b/tests/mic_cases/test-cr_liveusb_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_liveusb_help/options b/tests/mic_cases/test-cr_liveusb_help/options
new file mode 100644 (file)
index 0000000..d8bc885
--- /dev/null
+++ b/tests/mic_cases/test-cr_liveusb_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_loop_h/expect b/tests/mic_cases/test-cr_loop_h/expect
new file mode 100644 (file)
index 0000000..6f82a36
--- /dev/null
+++ b/tests/mic_cases/test-cr_loop_h/expect
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_loop_h/options b/tests/mic_cases/test-cr_loop_h/options
new file mode 100644 (file)
index 0000000..c01833b
--- /dev/null
+++ b/tests/mic_cases/test-cr_loop_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_loop_help/expect b/tests/mic_cases/test-cr_loop_help/expect
new file mode 100644 (file)
index 0000000..6f82a36
--- /dev/null
+++ b/tests/mic_cases/test-cr_loop_help/expect
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_loop_help/options b/tests/mic_cases/test-cr_loop_help/options
new file mode 100644 (file)
index 0000000..f2ae2da
--- /dev/null
+++ b/tests/mic_cases/test-cr_loop_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_raw_h/expect b/tests/mic_cases/test-cr_raw_h/expect
new file mode 100644 (file)
index 0000000..458efd8
--- /dev/null
+++ b/tests/mic_cases/test-cr_raw_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_raw_h/options b/tests/mic_cases/test-cr_raw_h/options
new file mode 100644 (file)
index 0000000..370e0a7
--- /dev/null
+++ b/tests/mic_cases/test-cr_raw_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_raw_help/expect b/tests/mic_cases/test-cr_raw_help/expect
new file mode 100644 (file)
index 0000000..458efd8
--- /dev/null
+++ b/tests/mic_cases/test-cr_raw_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cr_raw_help/options b/tests/mic_cases/test-cr_raw_help/options
new file mode 100644 (file)
index 0000000..65ba7d4
--- /dev/null
+++ b/tests/mic_cases/test-cr_raw_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_fs_h/expect b/tests/mic_cases/test-create_fs_h/expect
new file mode 100644 (file)
index 0000000..874e446
--- /dev/null
+++ b/tests/mic_cases/test-create_fs_h/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_fs_h/options b/tests/mic_cases/test-create_fs_h/options
new file mode 100644 (file)
index 0000000..33ff0bf
--- /dev/null
+++ b/tests/mic_cases/test-create_fs_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_fs_help/expect b/tests/mic_cases/test-create_fs_help/expect
new file mode 100644 (file)
index 0000000..874e446
--- /dev/null
+++ b/tests/mic_cases/test-create_fs_help/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_fs_help/options b/tests/mic_cases/test-create_fs_help/options
new file mode 100644 (file)
index 0000000..b8382b4
--- /dev/null
+++ b/tests/mic_cases/test-create_fs_help/options
@@ -0,0 +1 @@
+mic create fs --help

diff --git a/tests/mic_cases/test-create_h/conf.p b/tests/mic_cases/test-create_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_h/expect b/tests/mic_cases/test-create_h/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-create_h/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_h/options b/tests/mic_cases/test-create_h/options
new file mode 100644 (file)
index 0000000..9e5d718
--- /dev/null
+++ b/tests/mic_cases/test-create_h/options
@@ -0,0 +1 @@
+mic create -h

diff --git a/tests/mic_cases/test-create_help/conf.p b/tests/mic_cases/test-create_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help/expect b/tests/mic_cases/test-create_help/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-create_help/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help/options b/tests/mic_cases/test-create_help/options
new file mode 100644 (file)
index 0000000..8691ba6
--- /dev/null
+++ b/tests/mic_cases/test-create_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help_2line/expect b/tests/mic_cases/test-create_help_2line/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-create_help_2line/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help_2line/options b/tests/mic_cases/test-create_help_2line/options
new file mode 100644 (file)
index 0000000..77d34d7
--- /dev/null
+++ b/tests/mic_cases/test-create_help_2line/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help_mark/expect b/tests/mic_cases/test-create_help_mark/expect
new file mode 100644 (file)
index 0000000..8586d08
--- /dev/null
+++ b/tests/mic_cases/test-create_help_mark/expect
@@ -0,0 +1,40 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_help_mark/options b/tests/mic_cases/test-create_help_mark/options
new file mode 100644 (file)
index 0000000..ea14bd0
--- /dev/null
+++ b/tests/mic_cases/test-create_help_mark/options
@@ -0,0 +1 @@
+mic create ?

diff --git a/tests/mic_cases/test-create_livecd_h/conf.p b/tests/mic_cases/test-create_livecd_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_livecd_h/expect b/tests/mic_cases/test-create_livecd_h/expect
new file mode 100644 (file)
index 0000000..4b8cedc
--- /dev/null
+++ b/tests/mic_cases/test-create_livecd_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_livecd_h/options b/tests/mic_cases/test-create_livecd_h/options
new file mode 100644 (file)
index 0000000..9770353
--- /dev/null
+++ b/tests/mic_cases/test-create_livecd_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_livecd_help/expect b/tests/mic_cases/test-create_livecd_help/expect
new file mode 100644 (file)
index 0000000..4b8cedc
--- /dev/null
+++ b/tests/mic_cases/test-create_livecd_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_livecd_help/options b/tests/mic_cases/test-create_livecd_help/options
new file mode 100644 (file)
index 0000000..9692988
--- /dev/null
+++ b/tests/mic_cases/test-create_livecd_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_liveusb_h/expect b/tests/mic_cases/test-create_liveusb_h/expect
new file mode 100644 (file)
index 0000000..76fbe5d
--- /dev/null
+++ b/tests/mic_cases/test-create_liveusb_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_liveusb_h/options b/tests/mic_cases/test-create_liveusb_h/options
new file mode 100644 (file)
index 0000000..ee31109
--- /dev/null
+++ b/tests/mic_cases/test-create_liveusb_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_liveusb_help/expect b/tests/mic_cases/test-create_liveusb_help/expect
new file mode 100644 (file)
index 0000000..76fbe5d
--- /dev/null
+++ b/tests/mic_cases/test-create_liveusb_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_liveusb_help/options b/tests/mic_cases/test-create_liveusb_help/options
new file mode 100644 (file)
index 0000000..337b8d3
--- /dev/null
+++ b/tests/mic_cases/test-create_liveusb_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_loop_h/expect b/tests/mic_cases/test-create_loop_h/expect
new file mode 100644 (file)
index 0000000..6f82a36
--- /dev/null
+++ b/tests/mic_cases/test-create_loop_h/expect
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_loop_h/options b/tests/mic_cases/test-create_loop_h/options
new file mode 100644 (file)
index 0000000..7776ad9
--- /dev/null
+++ b/tests/mic_cases/test-create_loop_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_loop_help/expect b/tests/mic_cases/test-create_loop_help/expect
new file mode 100644 (file)
index 0000000..6f82a36
--- /dev/null
+++ b/tests/mic_cases/test-create_loop_help/expect
@@ -0,0 +1,10 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_loop_help/options b/tests/mic_cases/test-create_loop_help/options
new file mode 100644 (file)
index 0000000..92cf4a3
--- /dev/null
+++ b/tests/mic_cases/test-create_loop_help/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_raw_h/expect b/tests/mic_cases/test-create_raw_h/expect
new file mode 100644 (file)
index 0000000..458efd8
--- /dev/null
+++ b/tests/mic_cases/test-create_raw_h/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_raw_h/options b/tests/mic_cases/test-create_raw_h/options
new file mode 100644 (file)
index 0000000..fed002b
--- /dev/null
+++ b/tests/mic_cases/test-create_raw_h/options
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_raw_help/expect b/tests/mic_cases/test-create_raw_help/expect
new file mode 100644 (file)
index 0000000..458efd8
--- /dev/null
+++ b/tests/mic_cases/test-create_raw_help/expect
@@ -0,0 +1,7 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-create_raw_help/options b/tests/mic_cases/test-create_raw_help/options
new file mode 100644 (file)
index 0000000..8b966d3
--- /dev/null
+++ b/tests/mic_cases/test-create_raw_help/options
@@ -0,0 +1 @@
+mic create raw --help

diff --git a/tests/mic_cases/test-cv_h/conf.p b/tests/mic_cases/test-cv_h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cv_h/expect b/tests/mic_cases/test-cv_h/expect
new file mode 100644 (file)
index 0000000..19445c1
--- /dev/null
+++ b/tests/mic_cases/test-cv_h/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cv_h/options b/tests/mic_cases/test-cv_h/options
new file mode 100644 (file)
index 0000000..6ec0cdc
--- /dev/null
+++ b/tests/mic_cases/test-cv_h/options
@@ -0,0 +1 @@
+mic cv -h

diff --git a/tests/mic_cases/test-cv_help/conf.p b/tests/mic_cases/test-cv_help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cv_help/expect b/tests/mic_cases/test-cv_help/expect
new file mode 100644 (file)
index 0000000..19445c1
--- /dev/null
+++ b/tests/mic_cases/test-cv_help/expect
@@ -0,0 +1,8 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-cv_help/options b/tests/mic_cases/test-cv_help/options
new file mode 100644 (file)
index 0000000..cb2ab05
--- /dev/null
+++ b/tests/mic_cases/test-cv_help/options
@@ -0,0 +1 @@
+mic cv --help

diff --git a/tests/mic_cases/test-h/conf.p b/tests/mic_cases/test-h/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-h/expect b/tests/mic_cases/test-h/expect
new file mode 100644 (file)
index 0000000..edb6fe7
--- /dev/null
+++ b/tests/mic_cases/test-h/expect
@@ -0,0 +1,16 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-h/options b/tests/mic_cases/test-h/options
new file mode 100644 (file)
index 0000000..debd604
--- /dev/null
+++ b/tests/mic_cases/test-h/options
@@ -0,0 +1 @@
+mic -h

diff --git a/tests/mic_cases/test-help/conf.p b/tests/mic_cases/test-help/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-help/expect b/tests/mic_cases/test-help/expect
new file mode 100644 (file)
index 0000000..edb6fe7
--- /dev/null
+++ b/tests/mic_cases/test-help/expect
@@ -0,0 +1,16 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-help/options b/tests/mic_cases/test-help/options
new file mode 100644 (file)
index 0000000..b4f8b44
--- /dev/null
+++ b/tests/mic_cases/test-help/options
@@ -0,0 +1 @@
+mic --help

diff --git a/tests/mic_cases/test-help_mark/conf.p b/tests/mic_cases/test-help_mark/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-help_mark/expect b/tests/mic_cases/test-help_mark/expect
new file mode 100644 (file)
index 0000000..edb6fe7
--- /dev/null
+++ b/tests/mic_cases/test-help_mark/expect
@@ -0,0 +1,16 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-help_mark/options b/tests/mic_cases/test-help_mark/options
new file mode 100644 (file)
index 0000000..fbb72a7
--- /dev/null
+++ b/tests/mic_cases/test-help_mark/options
@@ -0,0 +1 @@
+mic ?

diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/options b/tests/mic_cases/test-ia32_livecd_pkgs_yum/options
index eff0b9f..afc3f8f 100644 (file)
--- a/tests/mic_cases/test-ia32_livecd_pkgs_yum/options
+++ b/tests/mic_cases/test-ia32_livecd_pkgs_yum/options
@@ -1 +1 @@
-mic create livecd  --pkgmgr=yum --local-pkgs-path=package_ia32
+mic create livecd  --pkgmgr=yum 

diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options
index 258f120..21047b3 100644 (file)
--- a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options
+++ b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options
@@ -1 +1 @@
-mic create livecd  --pkgmgr=zypp --local-pkgs-path=package_mixed
+mic create livecd  --pkgmgr=zypp

diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options
index 8ce4874..20fb9b6 100644 (file)
--- a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options
+++ b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options
@@ -1 +1 @@
-mic cr livecd  --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32
+mic cr livecd  --pkgmgr=yum --release=XXX

diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options
index f7cc1fb..9d3037f 100644 (file)
--- a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options
+++ b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options
@@ -1 +1 @@
-mic cr liveusb  --pkgmgr=yum --local-pkgs-path=package_mixed -o outdir5
+mic cr liveusb  --pkgmgr=yum -o outdir5

diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options
index d82f9e0..4822a6e 100644 (file)
--- a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options
+++ b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options
@@ -1 +1 @@
-mic create liveusb  --pkgmgr=zypp --local-pkgs-path=package_ia32
+mic create liveusb  --pkgmgr=zypp

diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options
index 8ce4874..6d05843 100644 (file)
--- a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options
+++ b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options
@@ -1 +1 @@
-mic cr livecd  --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32
+mic cr livecd  --pkgmgr=yum --release=XXX 

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
index b98e13f..c200688 100644 (file)
--- 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
@@ -1 +1 @@
-mic cr raw --pkgmgr=yum --outdir=outdir6 --release=XXX --logfile=logfile5 --local-pkgs-path=package_ia32 --record-pkgs=license
+mic cr raw --pkgmgr=yum --outdir=outdir6 --release=XXX --logfile=logfile5 --record-pkgs=license

diff --git a/tests/mic_cases/test-version/conf.p b/tests/mic_cases/test-version/conf.p
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-version/expect b/tests/mic_cases/test-version/expect
new file mode 100644 (file)
index 0000000..490f510
--- /dev/null
+++ b/tests/mic_cases/test-version/expect
@@ -0,0 +1 @@
+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
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/mic_cases/test-version/options b/tests/mic_cases/test-version/options
new file mode 100644 (file)
index 0000000..8aed032
--- /dev/null
+++ b/tests/mic_cases/test-version/options
@@ -0,0 +1 @@
+mic --version

diff --git a/tests/testbase.py b/tests/testbase.py
index 77b21ef..c167384 100644 (file)
--- a/tests/testbase.py
+++ b/tests/testbase.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import os 
+import os
 import sys
 import subprocess, re, shutil, glob
 import gettext
@@ -24,7 +24,7 @@ def PrepEnv(cases_dir, case, work_env):
         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
@@ -39,12 +39,12 @@ def ImgCheck(work_env):
 
 def RunandCheck(object, work_env):
     """run mic-image-creator command and check something"""
-    ret = False  
-  
+    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):
@@ -52,24 +52,48 @@ def RunandCheck(object, work_env):
         exp = exp_f.read()
         if len(exp) > 0:
             expect = exp.strip()
+        exp_f.close()
     #set cmdline    
     opt_f = open('options','r')
-    args = opt_f.read().strip()+' test.ks'
-    
+    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
-    proc = subprocess.Popen(args,stdout = sys.stdout ,stderr=subprocess.PIPE,shell=True)
+    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:#FIXME
+        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.system(POSTSCRIPTS)
     os.chdir(cwd)
-    
+
     try:
         object.assertTrue(ret)
     except object.failureException:
-        raise object.failureException(_("%s%s%s") %(COLOR_RED,errorinfo,COLOR_BLACK))    
+        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))