tests: testdriver: Rename default-pool -> pool-dir

And move the path to not be rooted in /dev, which doesn't make
sense for a directory pool, and triggers some special /dev handling
in virtinst that we don't want in the common testing path.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

8 files changed, 45 insertions, 45 deletions

diff --git a/tests/uitests/test_addhardware.py b/tests/uitests/test_addhardware.py
index aea4c0d6..e2f25741 100644
--- a/tests/uitests/test_addhardware.py
+++ b/tests/uitests/test_addhardware.py
@@ -176,7 +176,7 @@ def testAddDisks(app):
     browse = app.root.find("vmm-storage-browser")
 
     # Create a vol, refresh, then delete it
-    browse.find_fuzzy("default-pool", "table cell").click()
+    browse.find_fuzzy("pool-dir", "table cell").click()
     browse.find("vol-new", "push button").click()
     newvol = app.find_window("Add a Storage Volume")
     newname = "a-newvol"
@@ -229,7 +229,7 @@ def testAddDisks(app):
     tab.combo_select("Device type:", "Floppy device")
     diskradio = tab.find_fuzzy("Create a disk image", "radio")
     lib.utils.check(lambda: not diskradio.sensitive)
-    tab.find("storage-entry").set_text("/dev/default-pool/bochs-vol")
+    tab.find("storage-entry").set_text("/pool-dir/bochs-vol")
     _finish(addhw, check=details)
 
     # empty cdrom
@@ -532,7 +532,7 @@ def testAddLXCFilesystem(app):
     tab.find("Browse...", "push button").click()
     # Specific testing for dir vol handling for filesystem browse
     browsewin = app.root.find("vmm-storage-browser")
-    browsewin.find_fuzzy("default-pool", "table cell").click()
+    browsewin.find_fuzzy("pool-dir", "table cell").click()
     browsewin.find_fuzzy("bochs-vol", "table cell").click()
     choose = browsewin.find("Choose Volume")
     lib.utils.check(lambda: not choose.sensitive)
@@ -541,7 +541,7 @@ def testAddLXCFilesystem(app):
     choose.click()
     lib.utils.check(lambda: addhw.active)
     lib.utils.check(
-            lambda: source.text == "/dev/default-pool/dir-vol")
+            lambda: source.text == "/pool-dir/dir-vol")
 
     tab.find_fuzzy("Export filesystem", "check").click()
     # Use this to test some error.py logic for truncating large errors
diff --git a/tests/uitests/test_clonevm.py b/tests/uitests/test_clonevm.py
index 21cd94d0..9de41e18 100644
--- a/tests/uitests/test_clonevm.py
+++ b/tests/uitests/test_clonevm.py
@@ -148,7 +148,7 @@ def testCloneStorageChange(app):
     pathtxt = stgwin.find(None, "text", "New Path:")
     lib.utils.check(lambda: newname in pathtxt.text)
     stgwin.find("Browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "iso-vol")
+    app.select_storagebrowser_volume("pool-dir", "iso-vol")
     lib.utils.check(lambda: "iso-vol" in pathtxt.text)
     stgwin.find("OK").click()
     app.click_alert_button("overwrite the existing", "No")
@@ -224,7 +224,7 @@ def testCloneNonmanaged(app):
     win.find("IDE Disk 1", "table cell").click()
     win.find("XML", "page tab").click()
     xmleditor = win.find("XML editor")
-    origpath = "/dev/default-pool/test-clone-simple.img"
+    origpath = "/pool-dir/test-clone-simple.img"
     newpath = tmpsrc.name
     xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
     win.find("config-apply").click()
diff --git a/tests/uitests/test_createvm.py b/tests/uitests/test_createvm.py
index 67262ff0..048c37d6 100644
--- a/tests/uitests/test_createvm.py
+++ b/tests/uitests/test_createvm.py
@@ -105,7 +105,7 @@ def testNewVMMultiConnection(app):
     entry.click()
     # Launch this so we can verify storage browser is reset too
     newvm.find_fuzzy("install-iso-browse", "button").click()
-    app.select_storagebrowser_volume("default-pool", "iso-vol")
+    app.select_storagebrowser_volume("pool-dir", "iso-vol")
     newvm.find_fuzzy("Automatically detect", "check").click()
     newvm.find("oslist-entry").set_text("generic")
     newvm.find("oslist-popover").find_fuzzy("generic").click()
@@ -255,7 +255,7 @@ def testNewVMCDROMRegular(app):
 
     # Select a fake iso
     newvm.find_fuzzy("install-iso-browse", "button").click()
-    app.select_storagebrowser_volume("default-pool", "iso-vol")
+    app.select_storagebrowser_volume("pool-dir", "iso-vol")
 
     osentry = newvm.find("oslist-entry")
     lib.utils.check(lambda: osentry.text == "None detected")
@@ -456,7 +456,7 @@ def testNewKVMQ35Tweaks(app):
 
     newvm.find_fuzzy("Import", "radio").click()
     _forward(newvm)
-    newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
+    newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
     newvm.find("oslist-entry").set_text("fribfrob")
     popover = newvm.find("oslist-popover")
     popover.find_fuzzy("linux2020").click()
@@ -527,7 +527,7 @@ def testNewKVMQ35UEFI(app):
 
     newvm.find_fuzzy("Import", "radio").click()
     _forward(newvm)
-    newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
+    newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
     newvm.find("oslist-entry").set_text("fedora30")
     popover = newvm.find("oslist-popover")
     popover.find("include-eol").click()
@@ -630,7 +630,7 @@ def testNewVMAArch64UEFI(app):
     newvm.find_fuzzy("Automatically detect", "check").click()
     newvm.find("oslist-entry").set_text("generic")
     newvm.find("oslist-popover").find_fuzzy("generic").click()
-    newvm.find("media-entry").set_text("/dev/default-pool/testvol1.img")
+    newvm.find("media-entry").set_text("/pool-dir/testvol1.img")
     _forward(newvm)
     _forward(newvm)
     # Disable storage, this triggers a livecd code path in createvm.py
@@ -669,7 +669,7 @@ def testNewVMArmKernel(app):
     lib.utils.check(lambda: importradio.checked)
     _forward(newvm)
 
-    newvm.find("import-entry").set_text("/dev/default-pool/default-vol")
+    newvm.find("import-entry").set_text("/pool-dir/default-vol")
     # Make sure the info box shows up
     newvm.find("Kernel/initrd settings can be configured")
     newvm.find("oslist-entry").set_text("generic")
@@ -703,7 +703,7 @@ def testNewVMContainerApp(app):
     _forward(newvm, check=False)
     app.click_alert_button("path is required", "OK")
     newvm.find("install-app-browse").click()
-    app.select_storagebrowser_volume("default-pool", "aaa-unused.qcow2")
+    app.select_storagebrowser_volume("pool-dir", "aaa-unused.qcow2")
     lib.utils.check(lambda: "aaa-unused.qcow2" in apptext.text)
 
     _forward(newvm)
@@ -845,7 +845,7 @@ def testNewVMContainerTree(app):
     app.click_alert_button("path is required", "OK")
 
     newvm.find("install-oscontainer-browse").click()
-    app.select_storagebrowser_volume("default-pool", "dir-vol")
+    app.select_storagebrowser_volume("pool-dir", "dir-vol")
     lib.utils.check(lambda: "dir-vol" in dirtext.text)
 
     _forward(newvm)
@@ -955,7 +955,7 @@ def testNewVMXenPV(app):
 
     newvm.find_fuzzy("Import", "radio").click()
     _forward(newvm)
-    newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
+    newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
     newvm.find("oslist-entry").set_text("generic")
     newvm.find("oslist-popover").find_fuzzy("generic").click()
     _forward(newvm)
@@ -1001,7 +1001,7 @@ def testNewVMInstallFail(app):
     _back(newvm)
     newvm.find_fuzzy("Select or create", "radio").click()
 
-    newvm.find("storage-entry").set_text("/dev/default-pool/somenewvol1")
+    newvm.find("storage-entry").set_text("/pool-dir/somenewvol1")
     _forward(newvm)
     newvm.find_fuzzy("Name", "text").set_text("test-foo")
     newvm.find_fuzzy("Finish", "button").click()
@@ -1023,7 +1023,7 @@ def testNewVMCustomizeXMLEdit(app):
     newvm.find_fuzzy("Local install media", "radio").click()
     newvm.find_fuzzy("Forward", "button").click()
     nonexistpath = "/dev/foovmm-idontexist"
-    existpath = "/dev/default-pool/testvol1.img"
+    existpath = "/pool-dir/testvol1.img"
     newvm.find("media-entry").set_text(nonexistpath)
     lib.utils.check(
             lambda: newvm.find("oslist-entry").text == "None detected")
@@ -1134,10 +1134,10 @@ def testNewVMRemote(app):
     app.click_alert_button("import is required", "OK")
 
     # Click forward, but Import path doesn't exist
-    importtext.set_text("/dev/default-pool/idontexist")
+    importtext.set_text("/pool-dir/idontexist")
     _forward(newvm, check=False)
     app.click_alert_button("import path must point", "OK")
-    importtext.set_text("/dev/default-pool/default-vol")
+    importtext.set_text("/pool-dir/default-vol")
 
     # Click forward, hitting missing OS error
     _forward(newvm, check=False)
@@ -1162,9 +1162,9 @@ def testNewVMRemote(app):
     lib.utils.check(lambda: not browsewin.active)
     # Reopen, select storage
     newvm.find("install-import-browse").click()
-    app.select_storagebrowser_volume("default-pool", "bochs-vol")
+    app.select_storagebrowser_volume("pool-dir", "bochs-vol")
     lib.utils.check(
-            lambda: importtext.text == "/dev/default-pool/bochs-vol")
+            lambda: importtext.text == "/pool-dir/bochs-vol")
 
     _forward(newvm)
     _forward(newvm)
@@ -1183,7 +1183,7 @@ def testNewVMSession(app):
 
     newvm.find_fuzzy("Import", "radio").click()
     _forward(newvm)
-    newvm.find("import-entry").set_text("/dev/default-pool/testvol1.img")
+    newvm.find("import-entry").set_text("/pool-dir/testvol1.img")
     newvm.find("oslist-entry").set_text("generic")
     newvm.find("oslist-popover").find_fuzzy("generic").click()
     _forward(newvm)
diff --git a/tests/uitests/test_createvol.py b/tests/uitests/test_createvol.py
index 943e19c9..86d1fb0a 100644
--- a/tests/uitests/test_createvol.py
+++ b/tests/uitests/test_createvol.py
@@ -20,7 +20,7 @@ def testCreateVolDefault(app):
     Create default volume, clean it up
     """
     hostwin = app.manager_open_host("Storage")
-    poolcell = hostwin.find("default-pool", "table cell")
+    poolcell = hostwin.find("pool-dir", "table cell")
     poolcell.click()
     vollist = hostwin.find("vol-list", "table")
     win = _open_createvol(app, hostwin)
@@ -56,7 +56,7 @@ def testCreateVolMisc(app):
     Cover all createvol options
     """
     hostwin = app.manager_open_host("Storage")
-    poolcell = hostwin.find("default-pool", "table cell")
+    poolcell = hostwin.find("pool-dir", "table cell")
     poolcell.click()
     win = _open_createvol(app, hostwin)
     name = win.find("Name:", "text")
@@ -81,7 +81,7 @@ def testCreateVolMisc(app):
             "Locate existing storage", "file chooser")
     chooser.window_close()
     app.select_storagebrowser_volume(
-            "default-pool", "bochs-vol", doubleclick=True)
+            "pool-dir", "bochs-vol", doubleclick=True)
     backingstore = win.find("backing-store")
     lib.utils.check(lambda: "bochs-vol" in backingstore.text)
     finish.click()
@@ -119,7 +119,7 @@ def testCreateVolMisc(app):
 def testCreateVolXMLEditor(app):
     app.open(xmleditor_enabled=True)
     hostwin = app.manager_open_host("Storage")
-    poolcell = hostwin.find("default-pool", "table cell")
+    poolcell = hostwin.find("pool-dir", "table cell")
     poolcell.click()
     win = _open_createvol(app, hostwin)
     finish = win.find("Finish", "push button")
diff --git a/tests/uitests/test_delete.py b/tests/uitests/test_delete.py
index be96ccd1..1f446f96 100644
--- a/tests/uitests/test_delete.py
+++ b/tests/uitests/test_delete.py
@@ -97,8 +97,8 @@ def _testDeleteManyDevices(app,
     undeletable_rows = [r.path for r in rows if r.undeletable]
     notdefault_rows = [r.path for r in rows if r.notdefault]
 
-    defpath = "/dev/default-pool/overlay.img"
-    nondefault_path2 = "/dev/default-pool/sharevol.img"
+    defpath = "/pool-dir/overlay.img"
+    nondefault_path2 = "/pool-dir/sharevol.img"
 
     assert selected_rows == [defpath]
     if nondefault_path:
@@ -130,7 +130,7 @@ def _testDeleteManyDevices(app,
 
     # Confirm
     browser = _open_storage_browser(app)
-    browser.find_fuzzy("default-pool", "table cell").click()
+    browser.find_fuzzy("pool-dir", "table cell").click()
     browser.find("vol-refresh", "push button").click()
     lib.utils.check(lambda: "overlay.img" not in browser.fmt_nodes())
     browser.find("sharevol.img", "table cell")
@@ -205,7 +205,7 @@ def testDeleteSkipStorage(app):
 
     # Confirm nothing was deleted compare to the default selections
     browser = _open_storage_browser(app)
-    browser.find_fuzzy("default-pool", "table cell").click()
+    browser.find_fuzzy("pool-dir", "table cell").click()
     browser.find("vol-refresh", "push button").click()
     browser.find("overlay.img", "table cell")
     browser.find("sharevol.img", "table cell")
@@ -235,7 +235,7 @@ def testDeleteDeviceNoStorage(app):
     details.window_close()
 
     browser = _open_storage_browser(app)
-    browser.find_fuzzy("default-pool", "table cell").click()
+    browser.find_fuzzy("pool-dir", "table cell").click()
     browser.find("vol-refresh", "push button").click()
     browser.find("overlay.img", "table cell")
 
@@ -261,13 +261,13 @@ def testDeleteDeviceWithStorage(app):
     lib.utils.check(lambda: not chk.checked)
     chk.click()
     lib.utils.check(lambda: chk.checked)
-    path = "/dev/default-pool/overlay.img"
+    path = "/pool-dir/overlay.img"
     delete.find_fuzzy(path)
     _finish(app, delete, [path])
     details.window_close()
 
     browser = _open_storage_browser(app)
-    browser.find_fuzzy("default-pool", "table cell").click()
+    browser.find_fuzzy("pool-dir", "table cell").click()
     browser.find("vol-refresh", "push button").click()
     lib.utils.check(lambda: "overlay.img" not in browser.fmt_nodes())
 
@@ -292,7 +292,7 @@ def testDeleteDeviceFail(app):
     lib.utils.check(lambda: not chk.checked)
     chk.click()
     lib.utils.check(lambda: chk.checked)
-    path = "/dev/default-pool/overlay.img"
+    path = "/pool-dir/overlay.img"
     delete.find_fuzzy(path)
     _finish(app, delete, [path], expect_fail=True)
     app.click_alert_button("Storage will not be.*deleted", "OK")
@@ -300,6 +300,6 @@ def testDeleteDeviceFail(app):
 
     # Verify file still exists
     browser = _open_storage_browser(app)
-    browser.find_fuzzy("default-pool", "table cell").click()
+    browser.find_fuzzy("pool-dir", "table cell").click()
     browser.find("vol-refresh", "push button").click()
     browser.find("overlay.img", "table cell")
diff --git a/tests/uitests/test_details.py b/tests/uitests/test_details.py
index f823c9ef..98516111 100644
--- a/tests/uitests/test_details.py
+++ b/tests/uitests/test_details.py
@@ -331,7 +331,7 @@ def testDetailsEditDomain2(app):
 
     initrd = tab.find("Initrd path:", "text")
     tab.find("initrd-browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "backingl1.img")
+    app.select_storagebrowser_volume("pool-dir", "backingl1.img")
     lib.utils.check(lambda: win.active)
     lib.utils.check(lambda: "backing" in initrd.text)
     appl.click()
@@ -339,14 +339,14 @@ def testDetailsEditDomain2(app):
     lib.utils.check(lambda: win.active)
 
     tab.find("kernel-browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "bochs-vol")
+    app.select_storagebrowser_volume("pool-dir", "bochs-vol")
     lib.utils.check(lambda: win.active)
     kernelpath = tab.find("Kernel path:", "text")
     lib.utils.check(lambda: "bochs" in kernelpath.text)
 
     dtb = tab.find("DTB path:", "text")
     tab.find("dtb-browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "iso-vol")
+    app.select_storagebrowser_volume("pool-dir", "iso-vol")
     lib.utils.check(lambda: win.active)
     lib.utils.check(lambda: "iso-vol" in dtb.text)
 
@@ -779,7 +779,7 @@ def testDetailsXMLEdit(app):
     # Make some disk edits
     tab = _select_hw(app, win, "IDE Disk 1", "disk-tab")
     win.find("XML", "page tab").click()
-    origpath = "/dev/default-pool/test-clone-simple.img"
+    origpath = "/pool-dir/test-clone-simple.img"
     newpath = "/path/FOOBAR"
     xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
     finish.click()
diff --git a/tests/uitests/test_host.py b/tests/uitests/test_host.py
index b5807863..57d8307b 100644
--- a/tests/uitests/test_host.py
+++ b/tests/uitests/test_host.py
@@ -85,14 +85,14 @@ def testHostStorageEdit(app):
     finish = win.find("Apply", "push button")
 
     # Shut off a pool, do an XML edit, verify it
-    win.find("default-pool", "table cell").click()
+    win.find("pool-dir", "table cell").click()
     delete = win.find("pool-delete", "push button")
     stop = win.find("pool-stop", "push button")
     stop.click()
     lib.utils.check(lambda: delete.sensitive)
     win.find("XML", "page tab").click()
     xmleditor = win.find("XML editor")
-    origpath = "/dev/default-pool"
+    origpath = "/pool-dir"
     newpath = "/dev/foo/bar/baz"
     xmleditor.set_text(xmleditor.text.replace(origpath, newpath))
     finish.click()
@@ -120,7 +120,7 @@ def testHostStorageVolMisc(app):
     Misc actions involving volumes
     """
     win = app.manager_open_host("Storage").find("storage-grid")
-    win.find_fuzzy("default-pool", "table cell").click()
+    win.find_fuzzy("pool-dir", "table cell").click()
     vollist = win.find("vol-list", "table")
 
     vol1 = vollist.find("backingl1.img", "table cell")
@@ -136,7 +136,7 @@ def testHostStorageVolMisc(app):
     app.root.find("Copy Volume Path", "menu item").click()
     from gi.repository import Gdk, Gtk
     clipboard = Gtk.Clipboard.get_default(Gdk.Display.get_default())
-    lib.utils.check(lambda: clipboard.wait_for_text() == "/dev/default-pool/UPPER")
+    lib.utils.check(lambda: clipboard.wait_for_text() == "/pool-dir/UPPER")
 
 
 def testHostConn(app):
diff --git a/tests/uitests/test_mediachange.py b/tests/uitests/test_mediachange.py
index 9abfe906..f20a7cd1 100644
--- a/tests/uitests/test_mediachange.py
+++ b/tests/uitests/test_mediachange.py
@@ -52,7 +52,7 @@ def testMediaChange(app):
     entry.click()
     # Use the storage browser to select new floppy storage
     tab.find("Browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "iso-vol")
+    app.select_storagebrowser_volume("pool-dir", "iso-vol")
     appl.click()
 
     # Browse for image
@@ -61,7 +61,7 @@ def testMediaChange(app):
     combo.find(r"Fedora12_media \(/dev/sr0\)")
     entry.click()
     tab.find("Browse", "push button").click()
-    app.select_storagebrowser_volume("default-pool", "backingl1.img")
+    app.select_storagebrowser_volume("pool-dir", "backingl1.img")
     # Check 'already in use' dialog
     appl.click()
     app.click_alert_button("already in use by", "No")