fix: use specific exception types and add strict=False to zip calls

Author: GJFR

bughog/evaluation/file_structure.py

@@ -91,7 +91,7 @@ def parse(cls, path: str) -> Folder:
     def get_file(self, name: str) -> File:
         matched = [file for file in self.files if file.name == name]
         if len(matched) == 0:
-            raise Exception(f'Could not find {name} in {self.path}.')
+            raise FileNotFoundError(f'Could not find {name} in {self.path}.')
         return matched[0]
 
     def create_file(self, name: str, content: bytes):
@@ -103,7 +103,7 @@ def create_file(self, name: str, content: bytes):
     def get_folder(self, name: str) -> Folder:
         matched = [file for file in self.subfolders if file.name == name]
         if len(matched) == 0:
-            raise Exception(f'Could not find folder {name}.')
+            raise FileNotFoundError(f'Could not find folder {name} in {self.path}.')
         return matched[0]
 
     def create_folder(self, name: str) -> Folder:

bughog/search_strategy/bgb_search.py

@@ -118,7 +118,7 @@ def __create_pairs_between_clean_states(states: list[State]) -> list[tuple[State
         We assume there are no other clean states in this range.
         """
         return[
-            pair for pair in zip(states, states[1:])
+            pair for pair in zip(states, states[1:], strict=False)
             if not (pair[0].has_dirty_result() and pair[1].has_dirty_result())
         ]
 

bughog/search_strategy/bgb_sequence.py

@@ -43,7 +43,7 @@ def next(self, wait=True) -> State:
             self._add_state(self._upper_state)
             return self._upper_state
 
-        pairs = list(zip(self._considered_states, self._considered_states[1:]))
+        pairs = list(zip(self._considered_states, self._considered_states[1:], strict=False))
         while pairs:
             filtered_pairs = [pair for pair in pairs if not self._pair_is_in_unavailability_gap(pair)]
             furthest_pair = max(filtered_pairs, key=lambda x: x[1].index - x[0].index)

test/experiments/test_file_structure.py

@@ -157,13 +157,13 @@ def test_ignores_readme(self):
     def test_get_file_raises_when_missing(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             folder = Folder.parse(tmpdir)
-            with pytest.raises(Exception):
+            with pytest.raises(FileNotFoundError):
                 folder.get_file('nonexistent.html')
 
     def test_get_folder_raises_when_missing(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             folder = Folder.parse(tmpdir)
-            with pytest.raises(Exception):
+            with pytest.raises(FileNotFoundError):
                 folder.get_folder('nonexistent')
 
 

test/states/test_version.py

@@ -1,4 +1,5 @@
 import pytest
+from packaging.version import InvalidVersion
 
 from bughog.version_control.version import Version
 
@@ -56,7 +57,7 @@ def test_padded_version():
 
 
 def test_invalid_version():
-    with pytest.raises(Exception):
+    with pytest.raises(InvalidVersion):
         Version('not-a-version')