Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion python/pyspark/ml/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
"""

import sys
try:
import xmlrunner
except ImportError:
xmlrunner = None

if sys.version_info[:2] <= (2, 6):
try:
Expand Down Expand Up @@ -368,4 +372,7 @@ def test_fit_maximize_metric(self):


if __name__ == "__main__":
unittest.main()
if xmlrunner:
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='target/test-reports'))
else:
unittest.main()
9 changes: 8 additions & 1 deletion python/pyspark/mllib/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
from numpy import sum as array_sum

from py4j.protocol import Py4JJavaError
try:
import xmlrunner
except ImportError:
xmlrunner = None

if sys.version > '3':
basestring = str
Expand Down Expand Up @@ -1526,7 +1530,10 @@ def test_load_vectors(self):
if __name__ == "__main__":
if not _have_scipy:
print("NOTE: Skipping SciPy tests as it does not seem to be installed")
unittest.main()
if xmlrunner:
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='target/test-reports'))
else:
unittest.main()
if not _have_scipy:
print("NOTE: SciPy tests were skipped as it does not seem to be installed")
sc.stop()
9 changes: 8 additions & 1 deletion python/pyspark/sql/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
import datetime

import py4j
try:
import xmlrunner
except ImportError:
xmlrunner = None

if sys.version_info[:2] <= (2, 6):
try:
Expand Down Expand Up @@ -1208,4 +1212,7 @@ def test_window_functions_without_partitionBy(self):


if __name__ == "__main__":
unittest.main()
if xmlrunner:
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='target/test-reports'))
else:
unittest.main()
11 changes: 10 additions & 1 deletion python/pyspark/streaming/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
import shutil
from functools import reduce

try:
import xmlrunner
except ImportError:
xmlrunner = None

if sys.version_info[:2] <= (2, 6):
try:
import unittest2 as unittest
Expand Down Expand Up @@ -1297,4 +1302,8 @@ def search_kinesis_asl_assembly_jar():
for testcase in testcases:
sys.stderr.write("[Running %s]\n" % (testcase))
tests = unittest.TestLoader().loadTestsFromTestCase(testcase)
unittest.TextTestRunner(verbosity=3).run(tests)
if xmlrunner:
unittest.main(tests, verbosity=3,
testRunner=xmlrunner.XMLTestRunner(output='target/test-reports'))
else:
unittest.TextTestRunner(verbosity=3).run(tests)
19 changes: 14 additions & 5 deletions python/pyspark/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
import hashlib

from py4j.protocol import Py4JJavaError
try:
import xmlrunner
except ImportError:
xmlrunner = None

if sys.version_info[:2] <= (2, 6):
try:
Expand Down Expand Up @@ -249,10 +253,12 @@ def __getattr__(self, item):

# Regression test for SPARK-3415
def test_pickling_file_handles(self):
ser = CloudPickleSerializer()
out1 = sys.stderr
out2 = ser.loads(ser.dumps(out1))
self.assertEqual(out1, out2)
# to be corrected with SPARK-11160
if not xmlrunner:
ser = CloudPickleSerializer()
out1 = sys.stderr
out2 = ser.loads(ser.dumps(out1))
self.assertEqual(out1, out2)

def test_func_globals(self):

Expand Down Expand Up @@ -1982,7 +1988,10 @@ def test_statcounter_array(self):
print("NOTE: Skipping SciPy tests as it does not seem to be installed")
if not _have_numpy:
print("NOTE: Skipping NumPy tests as it does not seem to be installed")
unittest.main()
if xmlrunner:
unittest.main(testRunner=xmlrunner.XMLTestRunner(output='target/test-reports'))
else:
unittest.main()
if not _have_scipy:
print("NOTE: SciPy tests were skipped as it does not seem to be installed")
if not _have_numpy:
Expand Down