tests: Rename clone test VMs to have a common "test-clone" prefix

This commit is contained in:
Cole Robinson 2017-03-06 15:35:02 -05:00
parent 07f1a4e168
commit 84d8cd9896
4 changed files with 14 additions and 14 deletions

View File

@ -1,5 +1,5 @@
<domain type="test">
<name>test-for-clone1</name>
<name>test-clone1</name>
<uuid>00000000-1111-2222-3333-444444444444</uuid>
<memory unit="KiB">409600</memory>
<currentMemory unit="KiB">204800</currentMemory>

View File

@ -937,16 +937,16 @@ c.add_invalid("--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/
c = vclon.add_category("misc", "")
c.add_compare("--connect %(URI-KVM)s -o test-for-clone --auto-clone --clone-running", "clone-auto1", compare_check="1.2.15")
c.add_compare("--connect %(URI-KVM)s -o test-clone --auto-clone --clone-running", "clone-auto1", compare_check="1.2.15")
c.add_compare("-o test-clone-simple --name newvm --auto-clone --clone-running", "clone-auto2", compare_check="1.2.15")
c.add_valid("-o test --auto-clone") # Auto flag, no storage
c.add_valid("--original-xml %(CLONE_STORAGE_XML)s --auto-clone") # Auto flag w/ managed storage
c.add_valid("--original-xml %(CLONE_DISK_XML)s --auto-clone") # Auto flag w/ local storage
c.add_valid("-o test-for-clone --auto-clone --clone-running") # Auto flag, actual VM, skip state check
c.add_valid("-o test-clone --auto-clone --clone-running") # Auto flag, actual VM, skip state check
c.add_valid("-o test-clone-simple -n newvm --preserve-data --file %(EXISTIMG1)s --clone-running") # Preserve data shouldn't complain about existing volume
c.add_valid("-n clonetest --original-xml %(CLONE_DISK_XML)s --file %(EXISTIMG3)s --file %(EXISTIMG4)s --check path_exists=off") # Skip existing file check
c.add_invalid("--auto-clone") # Just the auto flag
c.add_invalid("-o test-for-clone --auto-clone")
c.add_invalid("-o test-clone --auto-clone")
c.add_invalid("-o test-clone-simple -n newvm --file %(EXISTIMG1)s --clone-running") # Should complain about overwriting existing file
@ -960,7 +960,7 @@ c.add_valid("--original-xml %(CLONE_DISK_XML)s --file %(NEWCLONEIMG1)s --file %(
c.add_valid("--original-xml %(CLONE_DISK_XML)s --file %(NEWCLONEIMG1)s --file %(NEWCLONEIMG2)s --force-copy=fda") # XML w/ disks, force copy a target with no media
c.add_valid("--original-xml %(CLONE_STORAGE_XML)s --file %(MANAGEDNEW1)s") # XML w/ managed storage, specify managed path
c.add_valid("--original-xml %(CLONE_NOEXIST_XML)s --file %(EXISTIMG1)s --preserve") # XML w/ managed storage, specify managed path across pools# Libvirt test driver doesn't support cloning across pools# XML w/ non-existent storage, with --preserve
c.add_valid("-o test -n test-for-clone --auto-clone --replace") # Overwriting existing VM
c.add_valid("-o test -n test-clone --auto-clone --replace") # Overwriting existing VM
c.add_invalid("-o test foobar") # Positional arguments error
c.add_invalid("-o idontexist") # Non-existent vm name
c.add_invalid("-o idontexist --auto-clone") # Non-existent vm name with auto flag,

View File

@ -800,7 +800,7 @@ test-many-devices, like an alternate RNG.
<domain type='test'>
<name>test-for-clone</name>
<name>test-clone</name>
<currentMemory>204800</currentMemory>
<memory>409600</memory>
<uuid>12345678-1234-1234-1234-12345678FFFF</uuid>
@ -867,7 +867,7 @@ test-many-devices, like an alternate RNG.
<domain type='test'>
<name>test-halffull-clone</name>
<name>test-clone-halffull</name>
<currentMemory>204800</currentMemory>
<memory>409600</memory>
<uuid>abcd5678-1234-1234-1234-12345678FFFF</uuid>
@ -902,7 +902,7 @@ test-many-devices, like an alternate RNG.
<domain type='test'>
<name>test-full-clone</name>
<name>test-clone-full</name>
<currentMemory>204800</currentMemory>
<memory>409600</memory>
<uuid>abcd5678-aaaa-1234-1234-12345678FFFF</uuid>

View File

@ -38,10 +38,10 @@ class VMMCLI(unittest.TestCase):
self.app.quit()
def testShowDetails(self):
self.app.open(extra_opts=["--show-domain-editor", "test-for-clone"])
self.app.open(extra_opts=["--show-domain-editor", "test-clone-simple"])
time.sleep(.5)
win = uiutils.find_fuzzy(self.app.root, "test-for-clone on", "frame")
win = uiutils.find_fuzzy(self.app.root, "test-clone-simple on", "frame")
self.assertFalse(
uiutils.find_fuzzy(win, "Graphical console not", "label").showing)
self.assertTrue(
@ -50,10 +50,10 @@ class VMMCLI(unittest.TestCase):
def testShowPerformance(self):
self.app.open(extra_opts=["--show-domain-performance",
"test-for-clone"])
"test-clone-simple"])
time.sleep(.5)
win = uiutils.find_fuzzy(self.app.root, "test-for-clone on", "frame")
win = uiutils.find_fuzzy(self.app.root, "test-clone-simple on", "frame")
self.assertFalse(
uiutils.find_fuzzy(win, "Graphical console not", "label").showing)
self.assertTrue(
@ -61,10 +61,10 @@ class VMMCLI(unittest.TestCase):
self.app.quit()
def testShowConsole(self):
self.app.open(extra_opts=["--show-domain-console", "test-for-clone"])
self.app.open(extra_opts=["--show-domain-console", "test-clone-simple"])
time.sleep(.5)
win = uiutils.find_fuzzy(self.app.root, "test-for-clone on", "frame")
win = uiutils.find_fuzzy(self.app.root, "test-clone-simple on", "frame")
self.assertTrue(
uiutils.find_fuzzy(win, "Graphical console not", "label").showing)
self.assertFalse(