[calcite] branch main updated: [CALCITE-5501] SqlToRelConverterTest.checkActualAndReferenceFiles fails intermittently in Jenkins CI

[asolimando]

This is an automated email from the ASF dual-hosted git repository.

asolimando pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new 03a0b9d937 [CALCITE-5501] 
SqlToRelConverterTest.checkActualAndReferenceFiles fails intermittently in 
Jenkins CI
03a0b9d937 is described below

commit 03a0b9d93774ad6d0a7c0909fa33bc9640a3a02a
Author: Alessandro Solimando <alessandro.solima...@gmail.com>
AuthorDate: Fri Jan 27 22:28:12 2023 +0100

    [CALCITE-5501] SqlToRelConverterTest.checkActualAndReferenceFiles fails 
intermittently in Jenkins CI
    
    Use the 'ResourceLock' JUnit5's annotation to force sequential execution of 
SqlToRelConverterTest and SqlToRelConverterExtendedTest test classes which have 
a race condition over SqlToRelConverterTest.xml file
---
 .../java/org/apache/calcite/test/SqlToRelConverterExtendedTest.java     | 2 ++
 core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git 
a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterExtendedTest.java 
b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterExtendedTest.java
index c18608aa6e..bb3dc45e7f 100644
--- 
a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterExtendedTest.java
+++ 
b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterExtendedTest.java
@@ -28,12 +28,14 @@ import org.apache.calcite.util.TestUtil;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.io.IOException;
 
 /**
  * Runs {@link org.apache.calcite.test.SqlToRelConverterTest} with extensions.
  */
+@ResourceLock(value = "SqlToRelConverterTest.xml")
 class SqlToRelConverterExtendedTest extends SqlToRelConverterTest {
   Hook.Closeable closeable;
 
diff --git 
a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java 
b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
index f7460a6611..77b84f7b46 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlToRelConverterTest.java
@@ -56,6 +56,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -73,6 +74,7 @@ import static org.hamcrest.core.Is.isA;
  * Unit test for {@link org.apache.calcite.sql2rel.SqlToRelConverter}.
  * See {@link RelOptRulesTest} for an explanation of how to add tests;
  */
+@ResourceLock(value = "SqlToRelConverterTest.xml")
 class SqlToRelConverterTest extends SqlToRelTestBase {
 
   private static final SqlToRelFixture LOCAL_FIXTURE =