GitHub user andrewor14 opened a pull request:
https://github.com/apache/spark/pull/6602
[SPARK-7558] Demarcate tests in unit-tests.log (1.3)
This includes the following commits:
original: 9eb222c
hotfix1: 8c99793
hotfix2: a4f2412
scalastyle check: 609c492
---
Original patch #6441
Branch-1.4 patch #6598
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/andrewor14/spark demarcate-tests-1.3
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/spark/pull/6602.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #6602
----
commit 8dffa0edfd2e45a60d19ec9c490035a47de30632
Author: Andrew Or <[email protected]>
Date: 2015-05-27T00:38:58Z
Introduce base abstract class for all test suites
commit 95ff5eb23071bfcc34adc9c2f0e0540eff3af008
Author: Andrew Or <[email protected]>
Date: 2015-05-27T16:11:03Z
Add core tests as dependencies in all modules
This is such that test suites in all modules can extend
SparkFunSuite.
Conflicts:
sql/catalyst/pom.xml
commit 192a47cabc894f1436dd48ac54cafd9c4b53d087
Author: Andrew Or <[email protected]>
Date: 2015-05-28T00:20:12Z
Fix log message
commit 9af2756cd6d7d849036a138f76e3e4de373938f6
Author: Andrew Or <[email protected]>
Date: 2015-06-03T02:06:21Z
Make all test suites extend SparkFunSuite instead of FunSuite
This is a big commit. In addition to just doing a search and
replace there is actually more work to do in ensuring that the
correct imports are introduced and the unused ones removed.
This step is largely automated. :)
Note that we exclude everything in the flume-sink module
because the dependencies do not work out there. A larger
comment will be added later to document why this is so.
commit 5342d5058cca6181abcb58fedf9a47d4deec35bc
Author: Andrew Or <[email protected]>
Date: 2015-05-27T22:07:33Z
Various whitespace changes (minor)
Conflicts:
core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferServiceSuite.scala
commit fec05c26048cbd46a5c294a7962745aecf1a8cbf
Author: Andrew Or <[email protected]>
Date: 2015-05-28T04:06:38Z
Fix tests
In core/test, it turns out that selenium is bringing in guava 15,
but the rest of Spark we use guava 14, which is evicted. Since
we made catalyst/test depend on core/test, and hive/test depends
on catalyst/test, hive tests are getting guava 15, which results
in java.lang.IllegalAccessError because of a dependency conflict.
This is resolved by excluding guava 15 from selenium in core/test.
commit 2b7a4f4b904b564330722fd5b7ff75c5f025264d
Author: Andrew Or <[email protected]>
Date: 2015-05-28T06:12:17Z
Fix tests?
Conflicts:
sql/hive-thriftserver/pom.xml
commit f782eddec5533878b5c2100f492d1e20733fb240
Author: Andrew Or <[email protected]>
Date: 2015-05-30T05:57:46Z
[SPARK-7558] Guard against direct uses of FunSuite / FunSuiteLike
This is a follow-up patch to #6441.
Author: Andrew Or <[email protected]>
Closes #6510 from andrewor14/extends-funsuite-check and squashes the
following commits:
6618b46 [Andrew Or] Exempt SparkSinkSuite from the FunSuite check
99d02ac [Andrew Or] Merge branch 'master' of github.com:apache/spark into
extends-funsuite-check
48874dd [Andrew Or] Guard against direct uses of FunSuite / FunSuiteLike
Conflicts:
scalastyle-config.xml
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
