Modified tests to accept SyclDeviceCreationError rather than ValueError

Author: oleksandr-pavlyk

dpctl/tests/test_sycl_context.py

@@ -129,7 +129,7 @@ def test_context_can_be_used_in_queue(valid_filter):
 def test_context_can_be_used_in_queue2(valid_filter):
     try:
         d = dpctl.SyclDevice(valid_filter)
-    except dpctl.SyclContextCreationError:
+    except dpctl.SyclDeviceCreationError:
         pytest.skip()
     if d.default_selector_score < 0:
         # skip test for devices rejected by default selector
@@ -141,7 +141,7 @@ def test_context_can_be_used_in_queue2(valid_filter):
 def test_context_multi_device():
     try:
         d = dpctl.SyclDevice("cpu")
-    except dpctl.SyclContextCreationError:
+    except dpctl.SyclDeviceCreationError:
         pytest.skip()
     if d.default_selector_score < 0:
         pytest.skip()

dpctl/tests/test_sycl_device.py

@@ -582,7 +582,7 @@ def test_standard_selectors(device_selector, check):
     try:
         device = device_selector()
         check(device)
-    except ValueError:
+    except dpctl.SyclDeviceCreationError:
         pytest.skip()
 
 
@@ -604,7 +604,7 @@ def test_valid_filter_selectors(valid_filter, check):
     device = None
     try:
         device = dpctl.SyclDevice(valid_filter)
-    except ValueError:
+    except SyclDeviceCreationError:
         pytest.skip("Failed to create device with supported filter")
     check(device)
 
@@ -629,7 +629,7 @@ def test_filter_string(valid_filter):
     device = None
     try:
         device = dpctl.SyclDevice(valid_filter)
-    except ValueError:
+    except SyclDeviceCreationError:
         pytest.skip("Failed to create device with supported filter")
     dev_id = device.filter_string
     assert (
@@ -722,7 +722,7 @@ def unsupported_aspect(request):
 def test_supported_aspect(supported_aspect):
     try:
         dpctl.select_device_with_aspects(supported_aspect)
-    except ValueError:
+    except dpctl.SyclDeviceCreationError:
         # ValueError may be raised if no device with
         # requested aspect charateristics is available
         pass
@@ -741,9 +741,9 @@ def test_unsupported_aspect(unsupported_aspect):
 
 
 def test_handle_no_device():
-    with pytest.raises(ValueError):
+    with pytest.raises(dpctl.SyclDeviceCreationError):
         dpctl.select_device_with_aspects(["gpu", "cpu"])
-    with pytest.raises(ValueError):
+    with pytest.raises(dpctl.SyclDeviceCreationError):
         dpctl.select_device_with_aspects("cpu", excluded_aspects="cpu")
 
 

dpctl/tests/test_sycl_queue.py

@@ -307,7 +307,7 @@ def test_standard_selectors(device_selector, check):
             pytest.skip()
         q = dpctl.SyclQueue(device)
         check(q.get_sycl_device())
-    except ValueError:
+    except dpctl.SyclDeviceCreationError:
         pytest.skip()