Merge remote-tracking branch 'origin/fix/tests-results' into fix/test…

…s-results
Consensys · Oct 11, 2024 · 6b07431 · 6b07431
2 parents 3c105f3 + d8192eb
commit 6b07431
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/reference-blockchain-tests.yml b/.github/workflows/reference-blockchain-tests.yml
@@ -70,6 +70,10 @@ jobs:
           commit: ${{ inputs.commit || '' }}
           if_no_artifact_found: ignore
 
+      - name: Rename filter input file
+        if: ${{ inputs.failed_module != '' }}
+        run: mv ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/failedBlockchainReferenceTests.json ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/failedBlockchainReferenceTests-input.json
+
       - name: Run reference blockchain tests
         run: ./gradlew referenceBlockchainTests -x spotlessCheck
         timeout-minutes: 180
@@ -82,6 +86,7 @@ jobs:
           FAILED_TEST_JSON_DIRECTORY: ${{ github.workspace }}/tmp/${{ steps.extract_branch.outputs.branch }}/
           FAILED_MODULE: ${{ inputs.failed_module || '' }}
           FAILED_CONSTRAINT: ${{ inputs.failed_constraint || '' }}
+          REFERENCE_TEST_FILTER_INPUT: failedBlockchainReferenceTests.json
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

diff --git a/reference-tests/src/main/java/net/consensys/linea/ReferenceTestOutcomeRecorderTool.java b/reference-tests/src/main/java/net/consensys/linea/ReferenceTestOutcomeRecorderTool.java
@@ -35,6 +35,7 @@
 @Slf4j
 public class ReferenceTestOutcomeRecorderTool {
 
+  public static final String JSON_INPUT_FILENAME = "failedBlockchainReferenceTests-input.json";
   public static final String JSON_OUTPUT_FILENAME = "failedBlockchainReferenceTests.json";
   public static JsonConverter jsonConverter = JsonConverter.builder().build();
   public static volatile BlockchainReferenceTestOutcome testOutcomes =

diff --git a/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java b/reference-tests/src/test/java/net/consensys/linea/BlockchainReferenceTestTools.java
@@ -16,6 +16,7 @@
 package net.consensys.linea;
 
 import static net.consensys.linea.BlockchainReferenceTestJson.readBlockchainReferenceTestsOutput;
+import static net.consensys.linea.ReferenceTestOutcomeRecorderTool.JSON_INPUT_FILENAME;
 import static net.consensys.linea.ReferenceTestOutcomeRecorderTool.JSON_OUTPUT_FILENAME;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -111,7 +112,7 @@ public static CompletableFuture<Set<String>> getRecordedFailedTestsFromJson(
     }
 
     CompletableFuture<BlockchainReferenceTestOutcome> modulesToConstraintsFutures =
-        readBlockchainReferenceTestsOutput(JSON_OUTPUT_FILENAME)
+        readBlockchainReferenceTestsOutput(JSON_INPUT_FILENAME)
             .thenApply(ReferenceTestOutcomeRecorderTool::parseBlockchainReferenceTestOutcome);
 
     return modulesToConstraintsFutures.thenApply(