tests: Self test virt-admin

Just like we are running 'virsh self-test' from within our test
suite, we should run 'virt-admin self-test' too.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/.gitignore b/.gitignore
index e87c08559f138e7b4e932aba34898b7ef7385b16..879ec244a5a22bf2012e41406544981ba7647778 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -169,6 +169,7 @@
 /tests/qemucapsprobe
 !/tests/virsh-self-test
 !/tests/virt-aa-helper-test
+!/tests/virt-admin-self-test
 /tests/objectlocking
 /tests/objectlocking-files.txt
 /tests/objectlocking.cm[ix]

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0cd83911848916649666d81b887791dcf8c50bec..924029abdcc62f4b0152dd9aed9725e9bfe4aaff 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -369,6 +369,7 @@ libvirtd_test_scripts =             \
        virsh-read-non-seekable         \
        virsh-schedinfo                 \
        virsh-self-test                 \
+       virt-admin-self-test                    \
        virsh-start                     \
        virsh-undefine                  \
        virsh-uriprecedence             \

diff --git a/tests/virsh-self-test b/tests/virsh-self-test
index 641810f05fbe17abe420b18d01cfc6db9e8c18c8..22396bceeea484c5807cbdd243af9d3db346caab 100755 (executable)
--- a/tests/virsh-self-test
+++ b/tests/virsh-self-test
@@ -21,14 +21,25 @@
 
 fail=0
 
-test_url=test:///default
+basename=$(basename $0)
+
+if test "x$basename" = "xvirsh-self-test" ; then
+    binary=virsh
+    extra_args="-c test:///default"
+elif test "x$basename" = "xvirt-admin-self-test" ; then
+    binary=virt-admin
+    extra_args=""
+else
+    echo "Unknown binary: $basename";
+    exit 1
+fi
 
-test_intro "virsh-self-test"
-$abs_top_builddir/tools/virsh -c $test_url self-test > /dev/null
+test_intro "$0"
+$abs_top_builddir/tools/${binary} ${extra_args} self-test > /dev/null
 status=$?
-test_result 1 "virsh-self-test" $status
+test_result 1 "$0" ${status}
 
-if test "$status" != "0" ; then
+if test "${status}" != "0" ; then
    fail=1
 fi
 

diff --git a/tests/virt-admin-self-test b/tests/virt-admin-self-test
new file mode 120000 (symlink)
index 0000000..d4ad624
--- /dev/null
+++ b/tests/virt-admin-self-test
@@ -0,0 +1 @@
+./virsh-self-test
\ No newline at end of file

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 12ec0578fbb683c706f947fb554d9589ba1a0aa7..36c92f5aefcde6596bbdf3d9a6a3fbe9e81bc052 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1242,6 +1242,7 @@ static const vshCmdDef vshAdmCmds[] = {
     VSH_CMD_HELP,
     VSH_CMD_PWD,
     VSH_CMD_QUIT,
+    VSH_CMD_SELF_TEST,
     {.name = "uri",
      .handler = cmdURI,
      .opts = NULL,