diff --git a/tests/uitests/__init__.py b/tests/uitests/__init__.py index fa9cef6f4..708f0bfcd 100644 --- a/tests/uitests/__init__.py +++ b/tests/uitests/__init__.py @@ -39,3 +39,5 @@ signal.signal(signal.SIGINT, signal.getsignal(signal.SIGINT)) # Needed so labels are matched in english os.environ['LANG'] = 'en_US.UTF-8' + +os.environ.pop("VIRTINST_TEST_SUITE", None) diff --git a/tests/uitests/addhardware.py b/tests/uitests/addhardware.py index 202626f31..e632bbb96 100644 --- a/tests/uitests/addhardware.py +++ b/tests/uitests/addhardware.py @@ -144,7 +144,6 @@ class AddHardware(uiutils.UITestCase): uiutils.check_in_loop(lambda: not addhw.showing) uiutils.check_in_loop(lambda: details.active) - @tests.utils.run_without_testsuite_hacks def testQemuSearchCheck(self): with tempfile.TemporaryDirectory() as tmpdir: with tempfile.NamedTemporaryFile(dir=tmpdir) as tmpfile: diff --git a/tests/uitests/newvm.py b/tests/uitests/newvm.py index 5d86b5a6b..32e3e4004 100644 --- a/tests/uitests/newvm.py +++ b/tests/uitests/newvm.py @@ -22,18 +22,6 @@ class NewVM(uiutils.UITestCase): self.app.root.find("New", "push button").click() return self.app.root.find("New VM", "frame") - def _do_simple_import(self, newvm): - # Create default PXE VM - newvm.find_fuzzy("Import", "radio").click() - newvm.find_fuzzy(None, - "text", "existing storage").text = "/dev/default-pool/testvol1.img" - self.forward(newvm) - newvm.find("oslist-entry").text = "generic" - newvm.find("oslist-popover").find_fuzzy("generic").click() - self.forward(newvm) - self.forward(newvm) - newvm.find_fuzzy("Finish", "button").click() - def forward(self, newvm, check=True): pagenumlabel = newvm.find("pagenum-label") oldtext = pagenumlabel.text @@ -280,7 +268,21 @@ class NewVM(uiutils.UITestCase): newvm.find_fuzzy("ppc64", "menu item").click() newvm.find_fuzzy("pseries", "menu item") - self._do_simple_import(newvm) + # Create default PXE VM + newvm.find_fuzzy("Import", "radio").click() + newvm.find_fuzzy(None, + "text", "existing storage").text = "/dev/default-pool/testvol1.img" + self.forward(newvm) + newvm.find("oslist-entry").text = "generic" + newvm.find("oslist-popover").find_fuzzy("generic").click() + self.forward(newvm, check=False) + + # Path permission check + alert = self.app.root.find("vmm dialog", "alert") + alert.find_fuzzy("No", "push button").click() + + self.forward(newvm) + newvm.find_fuzzy("Finish", "button").click() self.app.root.find_fuzzy("generic-ppc64 on", "frame") self.assertFalse(newvm.showing) @@ -326,6 +328,10 @@ class NewVM(uiutils.UITestCase): alert = self.app.root.find("vmm dialog", "alert") alert.find_fuzzy("Yes", "push button").click() + # Path permission check + alert = self.app.root.find("vmm dialog", "alert") + alert.find_fuzzy("No", "push button").click() + self.forward(newvm) newvm.find_fuzzy("Finish", "button").click() @@ -410,4 +416,13 @@ class NewVM(uiutils.UITestCase): newvm.find_fuzzy("Xen Type", "combo").click() newvm.find_fuzzy("paravirt", "menu item").click() - self._do_simple_import(newvm) + # Create default PXE VM + newvm.find_fuzzy("Import", "radio").click() + newvm.find_fuzzy(None, + "text", "existing storage").text = "/dev/default-pool/testvol1.img" + self.forward(newvm) + newvm.find("oslist-entry").text = "generic" + newvm.find("oslist-popover").find_fuzzy("generic").click() + self.forward(newvm) + self.forward(newvm) + newvm.find_fuzzy("Finish", "button").click()