From 4a825dcdc4e164c348dbae889da85acebabf9e5a Mon Sep 17 00:00:00 2001 From: Jon Vexler Date: Fri, 2 Dec 2022 22:16:46 -0500 Subject: [PATCH] [MINOR] Disable the `SparkSqlCoreFlow` tests (#7368) ## Change Logs Actually disable spark-sql core flow tests --- hudi-spark-datasource/hudi-spark/pom.xml | 3 ++ .../hudi/functional/SparkSQLCoreFlow.java | 32 +++++++++++++++++++ .../functional/TestSparkSqlCoreFlow.scala | 3 +- 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/SparkSQLCoreFlow.java diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml index 6b9fbe031ed41..91e06f0a922fd 100644 --- a/hudi-spark-datasource/hudi-spark/pom.xml +++ b/hudi-spark-datasource/hudi-spark/pom.xml @@ -135,6 +135,9 @@ org.scalatest scalatest-maven-plugin + + org.apache.hudi.functional.SparkSQLCoreFlow + org.scalastyle diff --git a/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/SparkSQLCoreFlow.java b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/SparkSQLCoreFlow.java new file mode 100644 index 0000000000000..9fd75cd29b97c --- /dev/null +++ b/hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/functional/SparkSQLCoreFlow.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hudi.functional; + +import org.scalatest.TagAnnotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@TagAnnotation +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface SparkSQLCoreFlow {} diff --git a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestSparkSqlCoreFlow.scala b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestSparkSqlCoreFlow.scala index 1143eb5faf47f..fc87a5cd6764a 100644 --- a/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestSparkSqlCoreFlow.scala +++ b/hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/functional/TestSparkSqlCoreFlow.scala @@ -29,13 +29,12 @@ import org.apache.spark.sql.{Dataset, Row} import org.apache.spark.sql.hudi.HoodieSparkSqlTestBase import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue} import org.apache.hudi.common.testutils.RawTripTestPayload.recordsToStrings -import org.junit.jupiter.api.Disabled import org.scalatest.Inspectors.forAll import java.io.File import scala.collection.JavaConversions._ -@Disabled("HUDI-5304 Disabling to avoid CI timing out") +@SparkSQLCoreFlow class TestSparkSqlCoreFlow extends HoodieSparkSqlTestBase { val colsToCompare = "timestamp, _row_key, partition_path, rider, driver, begin_lat, begin_lon, end_lat, end_lon, fare.amount, fare.currency, _hoodie_is_deleted"