Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SPARK-7558] Demarcate tests in unit-tests.log (1.3) #6602

Closed
wants to merge 9 commits into from

Conversation

andrewor14
Copy link
Contributor

This includes the following commits:

original: 9eb222c
hotfix1: 8c99793
hotfix2: a4f2412
scalastyle check: 609c492


Original patch #6441
Branch-1.4 patch #6598

Andrew Or added 8 commits June 2, 2015 18:52
This is such that test suites in all modules can extend
SparkFunSuite.

Conflicts:
	sql/catalyst/pom.xml
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.
Conflicts:
	core/src/test/scala/org/apache/spark/network/netty/NettyBlockTransferServiceSuite.scala
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.
Conflicts:
	sql/hive-thriftserver/pom.xml
This is a follow-up patch to apache#6441.

Author: Andrew Or <[email protected]>

Closes apache#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
@andrewor14
Copy link
Contributor Author

hive-thriftserver tests probably won't pass

This is the equivalent of 5cd6a63 and 4782e13 in master.
@SparkQA
Copy link

SparkQA commented Jun 3, 2015

Test build #34048 has finished for PR 6602 at commit f782edd.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Jun 3, 2015

Test build #34050 has finished for PR 6602 at commit a75ff8f.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@andrewor14
Copy link
Contributor Author

streaming flaky test. Jenkins retest this please

@SparkQA
Copy link

SparkQA commented Jun 3, 2015

Test build #34062 has finished for PR 6602 at commit a75ff8f.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@andrewor14
Copy link
Contributor Author

Weird objenesis failures again. retest this please.

@SparkQA
Copy link

SparkQA commented Jun 3, 2015

Test build #34072 has finished for PR 6602 at commit a75ff8f.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@andrewor14
Copy link
Contributor Author

YES this passed tests! I'm merging it into branch-1.3.

asfgit pushed a commit that referenced this pull request Jun 3, 2015
This includes the following commits:

original: 9eb222c
hotfix1: 8c99793
hotfix2: a4f2412
scalastyle check: 609c492

---
Original patch #6441
Branch-1.4 patch #6598

Author: Andrew Or <[email protected]>

Closes #6602 from andrewor14/demarcate-tests-1.3 and squashes the following commits:

a75ff8f [Andrew Or] Fix hive-thrift server log4j problem
f782edd [Andrew Or] [SPARK-7558] Guard against direct uses of FunSuite / FunSuiteLike
2b7a4f4 [Andrew Or] Fix tests?
fec05c2 [Andrew Or] Fix tests
5342d50 [Andrew Or] Various whitespace changes (minor)
9af2756 [Andrew Or] Make all test suites extend SparkFunSuite instead of FunSuite
192a47c [Andrew Or] Fix log message
95ff5eb [Andrew Or] Add core tests as dependencies in all modules
8dffa0e [Andrew Or] Introduce base abstract class for all test suites
@andrewor14 andrewor14 closed this Jun 3, 2015
@andrewor14 andrewor14 deleted the demarcate-tests-1.3 branch June 3, 2015 18:00
asfgit pushed a commit that referenced this pull request Jun 4, 2015
This includes the following commits:

original: 9eb222c
hotfix1: 8c99793
hotfix2: a4f2412
scalastyle check: 609c492

---
Original patch #6441
Branch-1.3 patch #6602

Author: Andrew Or <[email protected]>

Closes #6598 from andrewor14/demarcate-tests-1.4 and squashes the following commits:

4c3c566 [Andrew Or] Merge branch 'branch-1.4' of github.com:apache/spark into demarcate-tests-1.4
e217b78 [Andrew Or] [SPARK-7558] Guard against direct uses of FunSuite / FunSuiteLike
46d4361 [Andrew Or] Various whitespace changes (minor)
3d9bf04 [Andrew Or] Make all test suites extend SparkFunSuite instead of FunSuite
eaa520e [Andrew Or] Fix tests?
b4d93de [Andrew Or] Fix tests
634a777 [Andrew Or] Fix log message
a932e8d [Andrew Or] Fix manual things that cannot be covered through automation
8bc355d [Andrew Or] Add core tests as dependencies in all modules
75d361f [Andrew Or] Introduce base abstract class for all test suites
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants