fix flake8 tests

nipreps · May 15, 2024 · 6d3d3e4 · 6d3d3e4
1 parent 9c0c3c5
commit 6d3d3e4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/niworkflows/interfaces/tests/test_bids.py b/niworkflows/interfaces/tests/test_bids.py
@@ -300,7 +300,11 @@ def test_DerivativesDataSink_build_path(
         **entities,
     )
 
+<<<<<<< HEAD
     if isinstance(expectation, type):
+=======
+    if type(expectation) is type(Exception):
+>>>>>>> 601d1d1f (fix flake8 tests)
         with pytest.raises(expectation):
             dds.run()
         return