feat(tool): fix failing tests

Author: JigyasuRajput

cve_bin_tool/vex_manager/validate.py

@@ -193,31 +193,42 @@ def validate_file(
         else:
             # Use traditional jsonschema validation for CSAF and OpenVEX
             schema = self._get_schema(vex_type, version)
-            if (
-                schema and len(schema) > 0
-            ):  # Only validate if schema was successfully loaded and not empty
-                try:
-                    jsonschema.validate(instance=raw_data, schema=schema)
-                    self.logger.info(f"VEX file passed {vex_type} schema validation")
-                except JsonSchemaValidationError as e:
-                    # Convert jsonschema validation error to our format
-                    path = ".".join(str(p) for p in e.path) if e.path else None
-
+            if not schema or len(schema) == 0:  # Check if schema loading failed
+                # If we have errors from schema loading, don't proceed with validation
+                if self.errors:
+                    return False, self.errors, self.warnings
+                else:
+                    # If no specific errors but empty schema, add a generic error
                     self.errors.append(
                         ValidationError(
                             "SCHEMA_ERROR",
-                            f"Schema validation error: {e.message}",
-                            field=path,
-                            location=str(e.schema_path) if e.schema_path else None,
+                            f"Failed to load schema for {vex_type} validation",
                         )
                     )
-                except Exception as e:
-                    self.errors.append(
-                        ValidationError(
-                            "VALIDATION_ERROR",
-                            f"Error during schema validation: {str(e)}",
-                        )
+                    return False, self.errors, self.warnings
+
+            try:
+                jsonschema.validate(instance=raw_data, schema=schema)
+                self.logger.info(f"VEX file passed {vex_type} schema validation")
+            except JsonSchemaValidationError as e:
+                # Convert jsonschema validation error to our format
+                path = ".".join(str(p) for p in e.path) if e.path else None
+
+                self.errors.append(
+                    ValidationError(
+                        "SCHEMA_ERROR",
+                        f"Schema validation error: {e.message}",
+                        field=path,
+                        location=str(e.schema_path) if e.schema_path else None,
+                    )
+                )
+            except Exception as e:
+                self.errors.append(
+                    ValidationError(
+                        "VALIDATION_ERROR",
+                        f"Error during schema validation: {str(e)}",
                     )
+                )
 
         # Perform format-specific validations
         self._perform_format_specific_validation(raw_data, vex_type)

test/test_vex_validate.py

@@ -287,11 +287,15 @@ def test_schema_download_failure(self, mock_detect, mock_load_local, mock_urlope
 
     @patch("urllib.request.urlopen")
     @patch("cve_bin_tool.vex_manager.validate.VEXValidator._load_local_schema")
-    def test_network_timeout(self, mock_load_local, mock_urlopen):
+    @patch("cve_bin_tool.vex_manager.validate.SCHEMA_CACHE", new_callable=dict)
+    def test_network_timeout(self, mock_cache, mock_load_local, mock_urlopen):
         """Test handling of network timeout during schema download for non-CycloneDX formats."""
         import socket
 
-        # Mock local schema loading to return None to force download
+        # Clear cache to ensure clean test state
+        mock_cache.clear()
+
+        # Mock local schema loading to return empty dict to force download
         mock_load_local.return_value = {}
         mock_urlopen.side_effect = socket.timeout("Connection timed out")