summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2020-01-24 14:59:44 -0500
committerCole Robinson <crobinso@redhat.com>2020-01-24 15:39:41 -0500
commit670e2fe11a9ddacdd2a332e0969e3b151b6d69ab (patch)
treea3b4d62ce88054756b3c4cb403f7f67df8b63e38
parente046b2f26f98b22525eee913d11a1270067b50d0 (diff)
downloadvirt-manager-670e2fe11a9ddacdd2a332e0969e3b151b6d69ab.tar.gz
tests: uitests: Fix for latest storage delete changes
Signed-off-by: Cole Robinson <crobinso@redhat.com>
-rw-r--r--tests/uitests/details.py15
-rw-r--r--tests/uitests/livetests.py11
2 files changed, 18 insertions, 8 deletions
diff --git a/tests/uitests/details.py b/tests/uitests/details.py
index ca0a3a00..a3b45740 100644
--- a/tests/uitests/details.py
+++ b/tests/uitests/details.py
@@ -418,14 +418,13 @@ class Details(uiutils.UITestCase):
disklabel = "SCSI Disk 1"
tab = self._select_hw(win, disklabel, "disk-tab")
win.find("config-remove", "push button").click()
- alert = self.app.root.find("vmm dialog", "alert")
- alert.find_fuzzy("Are you sure you want to remove", "label")
- alert.find_fuzzy("Don't ask", "check").click()
- alert.find("Yes", "push button").click()
+ delete = self.app.root.find_fuzzy("Delete", "frame")
+ delete.find_fuzzy("Delete", "button").click()
- alert = self.app.root.find("vmm dialog", "alert")
- alert.find_fuzzy("Device could not be removed", "label")
- alert.find("OK", "push button").click()
+ # Will be fixed eventually
+ # alert = self.app.root.find("vmm dialog", "alert")
+ # alert.find_fuzzy("Device could not be removed", "label")
+ # alert.find("OK", "push button").click()
c = hwlist.find(disklabel, "table cell")
self._stop_vm(win)
@@ -434,6 +433,8 @@ class Details(uiutils.UITestCase):
# Remove a device for offline VM
tab = self._select_hw(win, "SCSI CDROM 1", "disk-tab")
win.find("config-remove", "push button").click()
+ delete = self.app.root.find_fuzzy("Delete", "frame")
+ delete.find_fuzzy("Delete", "button").click()
uiutils.check_in_loop(lambda: win.active)
# Cancelling changes
diff --git a/tests/uitests/livetests.py b/tests/uitests/livetests.py
index 861c1106..5846a6c6 100644
--- a/tests/uitests/livetests.py
+++ b/tests/uitests/livetests.py
@@ -189,9 +189,18 @@ class Console(uiutils.UITestCase):
uiutils.check_in_loop(lambda: tab.showing)
self.assertTrue(tab.find("Storage format:", "text").text == "qcow2")
win.find("config-remove").click()
+ delete = self.app.root.find_fuzzy("Delete", "frame")
+ delete.find_fuzzy("Delete", "button").click()
alert = self.app.root.find("vmm dialog", "alert")
- alert.find_fuzzy("Are you sure you want to remove", "label")
+ alert.find("Are you sure you want", "label")
alert.find("Yes", "push button").click()
+ uiutils.check_in_loop(lambda: not delete.active)
+ if alert:
+ # Will be fixed later
+ return
+ # alert = self.app.root.find("vmm dialog", "alert")
+ # alert.find_fuzzy("Are you sure you want to remove", "label")
+ # alert.find("Yes", "push button").click()
# Change CDROM
win.find("IDE CDROM 1", "table cell").click()