From 77695484117b6a931041454865277e898c0fe5f6 Mon Sep 17 00:00:00 2001 From: Oleg Vasilev Date: Thu, 1 Dec 2022 19:52:47 +0600 Subject: [PATCH] tests: cli: test serial file clone Previous commit added serial file clone, now we test it. Signed-off-by: Oleg Vasilev --- tests/data/cli/compare/virt-clone-serial.xml | 31 ++++++++++++++++++++ tests/data/cli/virtclone/clone-serial.xml | 31 ++++++++++++++++++++ tests/test_cli.py | 8 +++++ 3 files changed, 70 insertions(+) create mode 100644 tests/data/cli/compare/virt-clone-serial.xml create mode 100644 tests/data/cli/virtclone/clone-serial.xml diff --git a/tests/data/cli/compare/virt-clone-serial.xml b/tests/data/cli/compare/virt-clone-serial.xml new file mode 100644 index 000000000..af774b337 --- /dev/null +++ b/tests/data/cli/compare/virt-clone-serial.xml @@ -0,0 +1,31 @@ + + __virtinst_cli_test-clone1 + 00000000-1111-2222-3333-444444444444 + 8388608 + 2097152 + 2 + + hvm + + + + destroy + restart + destroy + + + + + + + + + + + + + + + + + diff --git a/tests/data/cli/virtclone/clone-serial.xml b/tests/data/cli/virtclone/clone-serial.xml new file mode 100644 index 000000000..4efedc72a --- /dev/null +++ b/tests/data/cli/virtclone/clone-serial.xml @@ -0,0 +1,31 @@ + + __virtinst_cli_test-clone + 00000000-1111-2222-3333-444444444444 + 8388608 + 2097152 + 2 + + hvm + + + + destroy + restart + destroy + + + + + + + + + + + + + + + + + diff --git a/tests/test_cli.py b/tests/test_cli.py index 34249639f..9814bea98 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -52,12 +52,18 @@ NEW_FILES = [ TMP_IMAGE_DIR + "new3.img", TMP_IMAGE_DIR + "exist1-clone.img", TMP_IMAGE_DIR + "exist2-clone.img", + + TMP_IMAGE_DIR + "test-clone1.file", + TMP_IMAGE_DIR + "other-serial-clone.file", + TMP_IMAGE_DIR + "serial-exists-clone-1.file", ] # Images that are expected to exist before a command is run EXIST_FILES = [ TMP_IMAGE_DIR + "exist1.img", TMP_IMAGE_DIR + "exist2.img", + + TMP_IMAGE_DIR + "serial-exists-clone.file", ] @@ -1491,6 +1497,7 @@ _CLONE_NVRAM_MISSING = "--original-xml %s/clone-nvram-missing.xml" % _CLONEXMLDI _CLONE_EMPTY = "--original-xml %s/clone-empty.xml" % _CLONEXMLDIR _CLONE_NET_RBD = "--original-xml %s/clone-net-rbd.xml" % _CLONEXMLDIR _CLONE_NET_HTTP = "--original-xml %s/clone-net-http.xml" % _CLONEXMLDIR +_CLONE_SERIAL = "--original-xml %s/clone-serial.xml" % _CLONEXMLDIR vclon = App("virt-clone") @@ -1514,6 +1521,7 @@ c.add_compare(_CLONE_EMPTY + " --auto-clone --print-xml", "empty") # Auto flag, c.add_compare("--connect %(URI-KVM-X86)s -o test-clone-simple --auto -f /foo.img --print-xml", "pool-test-cross-pool") # cross pool cloning which fails with test driver but let's confirm the XML c.add_compare(_CLONE_MANAGED + " --auto-clone", "auto-managed") # Auto flag w/ managed storage c.add_compare(_CLONE_UNMANAGED + " --auto-clone", "auto-unmanaged") # Auto flag w/ local storage +c.add_compare(_CLONE_SERIAL + " --auto-clone", "serial") # Auto flag w/ serial console c.add_valid("--connect %(URI-TEST-FULL)s -o test-clone --auto-clone --nonsparse") # Auto flag, actual VM, skip state check c.add_valid("--connect %(URI-TEST-FULL)s -o test-clone-simple -n newvm --preserve-data --file %(EXISTIMG1)s") # Preserve data shouldn't complain about existing volume c.add_valid("-n clonetest " + _CLONE_UNMANAGED + " --file %(EXISTIMG3)s --file %(EXISTIMG4)s --check path_exists=off") # Skip existing file check