7c05f61514
## What changes were proposed in this pull request?
Currently, pretty skipped message added by f7435bec6a
mechanism seems not working when xmlrunner is installed apparently.
This PR fixes two things:
1. When `xmlrunner` is installed, seems `xmlrunner` does not respect `vervosity` level in unittests (default is level 1).
So the output looks as below
```
Running tests...
----------------------------------------------------------------------
SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
----------------------------------------------------------------------
```
So it is not caught by our message detection mechanism.
2. If we manually set the `vervocity` level to `xmlrunner`, it prints messages as below:
```
test_mixed_udf (pyspark.sql.tests.test_pandas_udf_scalar.ScalarPandasUDFTests) ... SKIP (0.000s)
test_mixed_udf_and_sql (pyspark.sql.tests.test_pandas_udf_scalar.ScalarPandasUDFTests) ... SKIP (0.000s)
...
```
This is different in our Jenkins machine:
```
test_createDataFrame_column_name_encoding (pyspark.sql.tests.test_arrow.ArrowTests) ... skipped 'Pandas >= 0.23.2 must be installed; however, it was not found.'
test_createDataFrame_does_not_modify_input (pyspark.sql.tests.test_arrow.ArrowTests) ... skipped 'Pandas >= 0.23.2 must be installed; however, it was not found.'
...
```
Note that last `SKIP` is different. This PR fixes the regular expression to catch `SKIP` case as well.
## How was this patch tested?
Manually tested.
**Before:**
```
Starting test(python2.7): pyspark....
Finished test(python2.7): pyspark.... (0s)
...
Tests passed in 562 seconds
========================================================================
...
```
**After:**
```
Starting test(python2.7): pyspark....
Finished test(python2.7): pyspark.... (48s) ... 93 tests were skipped
...
Tests passed in 560 seconds
Skipped tests pyspark.... with python2.7:
pyspark...(...) ... SKIP (0.000s)
...
========================================================================
...
```
Closes #24927 from HyukjinKwon/SPARK-28130.
Authored-by: HyukjinKwon <gurwls223@apache.org>
Signed-off-by: HyukjinKwon <gurwls223@apache.org>
113 lines
3.7 KiB
Python
113 lines
3.7 KiB
Python
#
|
|
# 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.
|
|
#
|
|
|
|
import os
|
|
import sys
|
|
import tempfile
|
|
import unittest
|
|
|
|
from pyspark import SparkConf, SparkContext, BasicProfiler
|
|
from pyspark.testing.utils import PySparkTestCase
|
|
|
|
if sys.version >= "3":
|
|
from io import StringIO
|
|
else:
|
|
from StringIO import StringIO
|
|
|
|
|
|
class ProfilerTests(PySparkTestCase):
|
|
|
|
def setUp(self):
|
|
self._old_sys_path = list(sys.path)
|
|
class_name = self.__class__.__name__
|
|
conf = SparkConf().set("spark.python.profile", "true")
|
|
self.sc = SparkContext('local[4]', class_name, conf=conf)
|
|
|
|
def test_profiler(self):
|
|
self.do_computation()
|
|
|
|
profilers = self.sc.profiler_collector.profilers
|
|
self.assertEqual(1, len(profilers))
|
|
id, profiler, _ = profilers[0]
|
|
stats = profiler.stats()
|
|
self.assertTrue(stats is not None)
|
|
width, stat_list = stats.get_print_list([])
|
|
func_names = [func_name for fname, n, func_name in stat_list]
|
|
self.assertTrue("heavy_foo" in func_names)
|
|
|
|
old_stdout = sys.stdout
|
|
sys.stdout = io = StringIO()
|
|
self.sc.show_profiles()
|
|
self.assertTrue("heavy_foo" in io.getvalue())
|
|
sys.stdout = old_stdout
|
|
|
|
d = tempfile.gettempdir()
|
|
self.sc.dump_profiles(d)
|
|
self.assertTrue("rdd_%d.pstats" % id in os.listdir(d))
|
|
|
|
def test_custom_profiler(self):
|
|
class TestCustomProfiler(BasicProfiler):
|
|
def show(self, id):
|
|
self.result = "Custom formatting"
|
|
|
|
self.sc.profiler_collector.profiler_cls = TestCustomProfiler
|
|
|
|
self.do_computation()
|
|
|
|
profilers = self.sc.profiler_collector.profilers
|
|
self.assertEqual(1, len(profilers))
|
|
_, profiler, _ = profilers[0]
|
|
self.assertTrue(isinstance(profiler, TestCustomProfiler))
|
|
|
|
self.sc.show_profiles()
|
|
self.assertEqual("Custom formatting", profiler.result)
|
|
|
|
def do_computation(self):
|
|
def heavy_foo(x):
|
|
for i in range(1 << 18):
|
|
x = 1
|
|
|
|
rdd = self.sc.parallelize(range(100))
|
|
rdd.foreach(heavy_foo)
|
|
|
|
|
|
class ProfilerTests2(unittest.TestCase):
|
|
def test_profiler_disabled(self):
|
|
sc = SparkContext(conf=SparkConf().set("spark.python.profile", "false"))
|
|
try:
|
|
self.assertRaisesRegexp(
|
|
RuntimeError,
|
|
"'spark.python.profile' configuration must be set",
|
|
lambda: sc.show_profiles())
|
|
self.assertRaisesRegexp(
|
|
RuntimeError,
|
|
"'spark.python.profile' configuration must be set",
|
|
lambda: sc.dump_profiles("/tmp/abc"))
|
|
finally:
|
|
sc.stop()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
from pyspark.tests.test_profiler import *
|
|
|
|
try:
|
|
import xmlrunner
|
|
testRunner = xmlrunner.XMLTestRunner(output='target/test-reports', verbosity=2)
|
|
except ImportError:
|
|
testRunner = None
|
|
unittest.main(testRunner=testRunner, verbosity=2)
|