@@ -1154,8 +1154,8 @@ def search_kafka_assembly_jar():
11541154 "'build/sbt assembly/assembly streaming-kafka-assembly/assembly' or "
11551155 "'build/mvn package' before running this test." )
11561156 elif len (jars ) > 1 :
1157- raise Exception (("Found multiple Spark Streaming Kafka assembly JARs in %s; please "
1158- "remove all but one" ) % kafka_assembly_dir )
1157+ raise Exception (("Found multiple Spark Streaming Kafka assembly JARs: %s; please "
1158+ "remove all but one" ) % ( ", " . join ( jars )) )
11591159 else :
11601160 return jars [0 ]
11611161
@@ -1171,8 +1171,8 @@ def search_flume_assembly_jar():
11711171 "'build/sbt assembly/assembly streaming-flume-assembly/assembly' or "
11721172 "'build/mvn package' before running this test." )
11731173 elif len (jars ) > 1 :
1174- raise Exception (("Found multiple Spark Streaming Flume assembly JARs in %s; please "
1175- "remove all but one" ) % flume_assembly_dir )
1174+ raise Exception (("Found multiple Spark Streaming Flume assembly JARs: %s; please "
1175+ "remove all but one" ) % ( ", " . join ( jars )) )
11761176 else :
11771177 return jars [0 ]
11781178
@@ -1188,8 +1188,8 @@ def search_mqtt_assembly_jar():
11881188 "'build/sbt assembly/assembly streaming-mqtt-assembly/assembly' or "
11891189 "'build/mvn package' before running this test" )
11901190 elif len (jars ) > 1 :
1191- raise Exception (("Found multiple Spark Streaming MQTT assembly JARs in %s; please "
1192- "remove all but one" ) % mqtt_assembly_dir )
1191+ raise Exception (("Found multiple Spark Streaming MQTT assembly JARs: %s; please "
1192+ "remove all but one" ) % ( ", " . join ( jars )) )
11931193 else :
11941194 return jars [0 ]
11951195
@@ -1205,8 +1205,8 @@ def search_mqtt_test_jar():
12051205 "You need to build Spark with "
12061206 "'build/sbt assembly/assembly streaming-mqtt/test:assembly'" )
12071207 elif len (jars ) > 1 :
1208- raise Exception (("Found multiple Spark Streaming MQTT test JARs in %s; please "
1209- "remove all but one" ) % mqtt_test_dir )
1208+ raise Exception (("Found multiple Spark Streaming MQTT test JARs: %s; please "
1209+ "remove all but one" ) % ( ", " . join ( jars )) )
12101210 else :
12111211 return jars [0 ]
12121212
@@ -1218,8 +1218,8 @@ def search_kinesis_asl_assembly_jar():
12181218 if not jars :
12191219 return None
12201220 elif len (jars ) > 1 :
1221- raise Exception (("Found multiple Spark Streaming Kinesis ASL assembly JARs in %s; please "
1222- "remove all but one" ) % kinesis_asl_assembly_dir )
1221+ raise Exception (("Found multiple Spark Streaming Kinesis ASL assembly JARs: %s; please "
1222+ "remove all but one" ) % ( ", " . join ( jars )) )
12231223 else :
12241224 return jars [0 ]
12251225
0 commit comments