devices: disk: Skip check_path_search for path=""

virt-manager can trigger this when ejecting cdrom media

Fixes: #180

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

2 files changed, 9 insertions, 1 deletions

diff --git a/tests/test_disk.py b/tests/test_disk.py
index 17e72d19..b313b53c 100644
--- a/tests/test_disk.py
+++ b/tests/test_disk.py
@@ -65,6 +65,13 @@ def test_disk_dir_searchable(monkeypatch):
     tmpobj = tempfile.TemporaryDirectory(prefix="virtinst-test-search")
     tmpdir = tmpobj.name
     try:
+        # path="" should trigger early return
+        searchdata = virtinst.DeviceDisk.check_path_search(conn, "")
+        assert searchdata.uid is None
+        # path=None should trigger early return
+        searchdata = virtinst.DeviceDisk.check_path_search(conn, None)
+        assert searchdata.uid is None
+
         # Invalid uid
         _set_caps_baselabel_uid(-1)
         searchdata = virtinst.DeviceDisk.check_path_search(conn, tmpdir)
diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py
index 24a31807..412216bd 100644
--- a/virtinst/devices/disk.py
+++ b/virtinst/devices/disk.py
@@ -109,6 +109,7 @@ class DeviceDisk(Device):
             - username we checked for or None if not applicable
             - uid we checked for or None if not application
         """
+        log.debug("DeviceDisk.check_path_search path=%s", path)
         class SearchData(object):
             def __init__(self):
                 self.user = None
@@ -116,7 +117,7 @@ class DeviceDisk(Device):
                 self.fixlist = []
 
         searchdata = SearchData()
-        if path is None:
+        if not path:
             return searchdata
 
         if conn.is_remote():