Skip to content

Commit

Permalink
python style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
prabeesh committed Jul 11, 2015
1 parent e1ee016 commit 1f0cfe9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
8 changes: 7 additions & 1 deletion dev/sparktestsupport/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,13 @@ def contains_file(self, filename):

pyspark_streaming = Module(
name="pyspark-streaming",
dependencies=[pyspark_core, streaming, streaming_kafka, streaming_flume_assembly, streaming_mqtt],
dependencies=[
pyspark_core,
streaming,
streaming_kafka,
streaming_flume_assembly,
streaming_mqtt
],
source_file_regexes=[
"python/pyspark/streaming"
],
Expand Down
9 changes: 6 additions & 3 deletions python/pyspark/streaming/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ def test_flume_polling(self):
def test_flume_polling_multiple_hosts(self):
self._testMultipleTimes(self._testFlumePollingMultipleHosts)


class MQTTStreamTests(PySparkStreamingTestCase):
timeout = 20 # seconds
duration = 1
Expand All @@ -841,8 +842,8 @@ def setUp(self):

def tearDown(self):
if self._MQTTTestUtils is not None:
self._MQTTTestUtils.teardown()
self._MQTTTestUtils = None
self._MQTTTestUtils.teardown()
self._MQTTTestUtils = None

super(MQTTStreamTests, self).tearDown()

Expand Down Expand Up @@ -905,10 +906,11 @@ def search_flume_assembly_jar():
"'build/mvn package' before running this test")
elif len(jars) > 1:
raise Exception(("Found multiple Spark Streaming Flume assembly JARs in %s; please "
"remove all but one") % flume_assembly_dir)
"remove all but one") % flume_assembly_dir)
else:
return jars[0]


def search_mqtt_assembly_jar():
SPARK_HOME = os.environ["SPARK_HOME"]
mqtt_assembly_dir = os.path.join(SPARK_HOME, "external/mqtt-assembly")
Expand All @@ -926,6 +928,7 @@ def search_mqtt_assembly_jar():
else:
return jars[0]


if __name__ == "__main__":
kafka_assembly_jar = search_kafka_assembly_jar()
flume_assembly_jar = search_flume_assembly_jar()
Expand Down

0 comments on commit 1f0cfe9

Please sign in to comment.