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>
87 lines
3 KiB
Python
87 lines
3 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 unittest
|
|
|
|
from py4j.protocol import Py4JJavaError
|
|
|
|
from pyspark import keyword_only
|
|
from pyspark.testing.utils import PySparkTestCase
|
|
|
|
|
|
class KeywordOnlyTests(unittest.TestCase):
|
|
class Wrapped(object):
|
|
@keyword_only
|
|
def set(self, x=None, y=None):
|
|
if "x" in self._input_kwargs:
|
|
self._x = self._input_kwargs["x"]
|
|
if "y" in self._input_kwargs:
|
|
self._y = self._input_kwargs["y"]
|
|
return x, y
|
|
|
|
def test_keywords(self):
|
|
w = self.Wrapped()
|
|
x, y = w.set(y=1)
|
|
self.assertEqual(y, 1)
|
|
self.assertEqual(y, w._y)
|
|
self.assertIsNone(x)
|
|
self.assertFalse(hasattr(w, "_x"))
|
|
|
|
def test_non_keywords(self):
|
|
w = self.Wrapped()
|
|
self.assertRaises(TypeError, lambda: w.set(0, y=1))
|
|
|
|
def test_kwarg_ownership(self):
|
|
# test _input_kwargs is owned by each class instance and not a shared static variable
|
|
class Setter(object):
|
|
@keyword_only
|
|
def set(self, x=None, other=None, other_x=None):
|
|
if "other" in self._input_kwargs:
|
|
self._input_kwargs["other"].set(x=self._input_kwargs["other_x"])
|
|
self._x = self._input_kwargs["x"]
|
|
|
|
a = Setter()
|
|
b = Setter()
|
|
a.set(x=1, other=b, other_x=2)
|
|
self.assertEqual(a._x, 1)
|
|
self.assertEqual(b._x, 2)
|
|
|
|
|
|
class UtilTests(PySparkTestCase):
|
|
def test_py4j_exception_message(self):
|
|
from pyspark.util import _exception_message
|
|
|
|
with self.assertRaises(Py4JJavaError) as context:
|
|
# This attempts java.lang.String(null) which throws an NPE.
|
|
self.sc._jvm.java.lang.String(None)
|
|
|
|
self.assertTrue('NullPointerException' in _exception_message(context.exception))
|
|
|
|
def test_parsing_version_string(self):
|
|
from pyspark.util import VersionUtils
|
|
self.assertRaises(ValueError, lambda: VersionUtils.majorMinorVersion("abced"))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
from pyspark.tests.test_util import *
|
|
|
|
try:
|
|
import xmlrunner
|
|
testRunner = xmlrunner.XMLTestRunner(output='target/test-reports', verbosity=2)
|
|
except ImportError:
|
|
testRunner = None
|
|
unittest.main(testRunner=testRunner, verbosity=2)
|