summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOndrej Holy <oholy@redhat.com>2016-06-02 10:54:36 +0200
committerOndrej Holy <oholy@redhat.com>2016-06-02 10:54:36 +0200
commitc38eada54168ec303fce76f3ec545c013485d592 (patch)
treebacaa1b1ae331c903bf7498ffc30cbcd29699c7d /test
parent85af0e5a26dcdbb86811d28005ae59e7432388dc (diff)
downloadgvfs-c38eada54168ec303fce76f3ec545c013485d592.tar.gz
test: Do not fail if umockdev is not installed
Change introduced by commit 6d77394 results in ValueError exception if umockdev is not installed. This exception is not handled and thus the test is unexpectedly terminated. Handle this exception and set have_umockdev accordingly.
Diffstat (limited to 'test')
-rwxr-xr-xtest/gvfs-test2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gvfs-test b/test/gvfs-test
index 041bdfb3..fbaebbc4 100755
--- a/test/gvfs-test
+++ b/test/gvfs-test
@@ -44,7 +44,7 @@ try:
have_umockdev = subprocess.call(['which', 'umockdev-wrapper'], stdout=subprocess.PIPE) == 0
# needs >= 0.2.10
have_umockdev = have_umockdev and hasattr(UMockdev.Testbed, 'add_from_file')
-except ImportError:
+except (ValueError, ImportError):
have_umockdev = False
# umockdev environment for gphoto/MTP tests