Use two parameters.

Author: dongjoon-hyun

python/pyspark/sql/avro/functions.py

@@ -100,7 +100,7 @@ def _test():
     import os
     import sys
     from pyspark.testing.utils import search_jar
-    avro_jar = search_jar("external/avro", "spark-avro")
+    avro_jar = search_jar("external/avro", "spark-avro", "spark-avro")
     if avro_jar is None:
         print(
             "Skipping all Avro Python tests as the optional Avro project was "

python/pyspark/testing/streamingutils.py

@@ -34,7 +34,8 @@
         "was not set.")
 else:
     kinesis_asl_assembly_jar = search_jar("external/kinesis-asl-assembly",
-                                          "spark-streaming-kinesis-asl-assembly")
+                                          "spark-streaming-kinesis-asl-assembly-",
+                                          "spark-streaming-kinesis-asl-assembly_")
     if kinesis_asl_assembly_jar is None:
         kinesis_requirement_message = (
             "Skipping all Kinesis Python tests as the optional Kinesis project was "

python/pyspark/testing/utils.py

@@ -103,7 +103,7 @@ def close(self):
         pass
 
 
-def search_jar(project_relative_path, jar_name_prefix):
+def search_jar(project_relative_path, sbt_jar_name_prefix, mvn_jar_name_prefix):
     project_full_path = os.path.join(
         os.environ["SPARK_HOME"], project_relative_path)
 
@@ -113,9 +113,9 @@ def search_jar(project_relative_path, jar_name_prefix):
     # Search jar in the project dir using the jar name_prefix for both sbt build and maven
     # build because the artifact jars are in different directories.
     sbt_build = glob.glob(os.path.join(
-        project_full_path, "target/scala-*/%s-*.jar" % jar_name_prefix))
+        project_full_path, "target/scala-*/%s*.jar" % sbt_jar_name_prefix))
     maven_build = glob.glob(os.path.join(
-        project_full_path, "target/%s_*.jar" % jar_name_prefix))
+        project_full_path, "target/%s*.jar" % mvn_jar_name_prefix))
     jar_paths = sbt_build + maven_build
     jars = [jar for jar in jar_paths if not jar.endswith(ignored_jar_suffixes)]