From 230319ae3db47ed9c35dc7faa733a84f9ce87ff9 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 25 Jun 2026 14:50:26 +0900 Subject: test: un-ignore tests unblocked by zip/spdx/jsonlint/stream impls Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/tests/json/json_file_test.rs | 2 -- 1 file changed, 2 deletions(-) (limited to 'crates/shirabe/tests/json/json_file_test.rs') diff --git a/crates/shirabe/tests/json/json_file_test.rs b/crates/shirabe/tests/json/json_file_test.rs index aea34ba..cd4445c 100644 --- a/crates/shirabe/tests/json/json_file_test.rs +++ b/crates/shirabe/tests/json/json_file_test.rs @@ -503,7 +503,6 @@ fn test_composer_lock_file_merge_conflict_simple_crlf() { } #[test] -#[ignore] fn test_composer_lock_file_merge_conflict_complex() { // complex files have multiple conflict markers and can thus not be simply resolved let data = @@ -514,7 +513,6 @@ fn test_composer_lock_file_merge_conflict_complex() { } #[test] -#[ignore] fn test_composer_lock_file_merge_conflict_complex_crlf() { // complex files have multiple conflict markers and can thus not be simply resolved let data = std::fs::read_to_string(fixture_path( -- cgit v1.3.1