Skip to content

[SPARK-30076][BUILD][TESTS] Upgrade Mockito to 3.1.0 #26707

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.

Sign up for GitHub

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

Jump to bottom
Closed
HyukjinKwon wants to merge 1 commit into from
Closed

[SPARK-30076][BUILD][TESTS] Upgrade Mockito to 3.1.0 #26707

HyukjinKwon wants to merge 1 commit into from

Conversation

@HyukjinKwon
Copy link
Member

@HyukjinKwon HyukjinKwon commented Nov 29, 2019 •
edited
Loading

What changes were proposed in this pull request?

We used 2.28.2 of Mockito as of #25139 because 3.0.0 might be unstable. Now 3.1.0 is released.

See release notes - https://github.com/mockito/mockito/blob/v3.1.0/doc/release-notes/official.md

Why are the changes needed?

To bring the fixes made in the dependency.

Does this PR introduce any user-facing change?

No.

How was this patch tested?

Jenkins will test.

@SparkQA

This comment has been minimized.

Sign in to view
@HyukjinKwon HyukjinKwon changed the title [WIP] Upgrade Mockito to 3.1.0 [WIP][test-hadoop2.6] Upgrade Mockito to 3.1.0 Nov 29, 2019
@HyukjinKwon HyukjinKwon changed the title [WIP][test-hadoop2.6] Upgrade Mockito to 3.1.0 [WIP] Upgrade Mockito to 3.1.0 Nov 29, 2019
@HyukjinKwon HyukjinKwon mentioned this pull request Nov 29, 2019
Closed
@HyukjinKwon HyukjinKwon changed the title [WIP] Upgrade Mockito to 3.1.0 [WIP][test-hadoop2.6] Upgrade Mockito to 3.1.0 Nov 29, 2019
@SparkQA

This comment has been minimized.

Sign in to view
@SparkQA

This comment has been minimized.

Sign in to view
@HyukjinKwon HyukjinKwon changed the title [WIP][test-hadoop2.6] Upgrade Mockito to 3.1.0 [WIP] Upgrade Mockito to 3.1.0 Nov 29, 2019
@SparkQA
Copy link

SparkQA commented Nov 29, 2019

Test build #114600 has finished for PR 26707 at commit b35a586.

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

@HyukjinKwon HyukjinKwon changed the title [WIP] Upgrade Mockito to 3.1.0 [SPARK-30076][BUILD] Upgrade Mockito to 3.1.0 Nov 29, 2019
@HyukjinKwon HyukjinKwon changed the title [SPARK-30076][BUILD] Upgrade Mockito to 3.1.0 [SPARK-30076][BUILD][TESTS] Upgrade Mockito to 3.1.0 Nov 29, 2019
@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 29, 2019

cc @srowen and @dongjoon-hyun

srowen
srowen reviewed Nov 29, 2019
View reviewed changes
Copy link
Member

@srowen srowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine if it tests pass.

HyukjinKwon added a commit that referenced this pull request Nov 30, 2019
@HyukjinKwon
[SPARK-25016][INFRA][FOLLOW-UP] Remove leftover for dropping Hadoop 2…
32af700 
….6 in Jenkins's test script

### What changes were proposed in this pull request?

This PR proposes to remove the leftover. After #22615, we don't have Hadoop 2.6 profile anymore in master.

### Why are the changes needed?

Using "test-hadoop2.6" against master branch in a PR wouldn't work.

### Does this PR introduce any user-facing change?

No (dev only).

### How was this patch tested?

Manually tested at #26707 and Jenkins build will test.

Without this fix, and hadoop2.6 in the pr title, it shows as below:

```
========================================================================
Building Spark
========================================================================
[error] Could not find hadoop2.6 in the list. Valid options  are dict_keys(['hadoop2.7', 'hadoop3.2'])
Attempting to post to Github...
```

Closes #26708 from HyukjinKwon/SPARK-25016.

Authored-by: HyukjinKwon <[email protected]>
Signed-off-by: HyukjinKwon <[email protected]>
@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

@shahidki31
Copy link
Contributor

shahidki31 commented Nov 30, 2019 •
edited
Loading

I think now we need to add HiveThriftServer2ListenerSuite in testsWhichShouldRunInTheirOwnDedicatedJvm as that also uses Mockito now. I will try using scala Mockito as a followup PR, to let me see if it fixes the issues. https://github.com/mockito/mockito-scala.

@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114641 has finished for PR 26707 at commit b35a586.

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

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

That one looked flaky, yes. Sure, let's see if that works.

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019 •
edited
Loading

@shahidki31, let's wait and see other builds. This specific test failure (after 4a73bed) might happen only in my PR too.

@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114647 has finished for PR 26707 at commit b35a586.

  • This patch fails due to an unknown error code, -9.
  • This patch merges cleanly.
  • This patch adds no public classes.

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

@HyukjinKwon HyukjinKwon mentioned this pull request Nov 30, 2019
Closed
@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114659 has finished for PR 26707 at commit b35a586.

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

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

1 similar comment
@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114665 has finished for PR 26707 at commit b35a586.

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

@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114666 has finished for PR 26707 at commit b35a586.

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

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

retest this please

@SparkQA
Copy link

SparkQA commented Nov 30, 2019

Test build #114670 has finished for PR 26707 at commit b35a586.

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

srowen
srowen approved these changes Nov 30, 2019
View reviewed changes
Copy link
Member

@srowen srowen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This much looks good.

@srowen srowen closed this in f32ca4b Nov 30, 2019
@srowen
Copy link
Member

srowen commented Nov 30, 2019

Merged to master

@HyukjinKwon
Copy link
Member Author

HyukjinKwon commented Nov 30, 2019

Thanks @srowen.

@dongjoon-hyun
Copy link
Member

dongjoon-hyun commented Dec 2, 2019

+1, late LGTM~

attilapiros pushed a commit to attilapiros/spark that referenced this pull request Dec 6, 2019
@HyukjinKwon @attilapiros
[SPARK-25016][INFRA][FOLLOW-UP] Remove leftover for dropping Hadoop 2…
1b217ce 
….6 in Jenkins's test script

### What changes were proposed in this pull request?

This PR proposes to remove the leftover. After apache#22615, we don't have Hadoop 2.6 profile anymore in master.

### Why are the changes needed?

Using "test-hadoop2.6" against master branch in a PR wouldn't work.

### Does this PR introduce any user-facing change?

No (dev only).

### How was this patch tested?

Manually tested at apache#26707 and Jenkins build will test.

Without this fix, and hadoop2.6 in the pr title, it shows as below:

```
========================================================================
Building Spark
========================================================================
[error] Could not find hadoop2.6 in the list. Valid options  are dict_keys(['hadoop2.7', 'hadoop3.2'])
Attempting to post to Github...
```

Closes apache#26708 from HyukjinKwon/SPARK-25016.

Authored-by: HyukjinKwon <[email protected]>
Signed-off-by: HyukjinKwon <[email protected]>
attilapiros pushed a commit to attilapiros/spark that referenced this pull request Dec 6, 2019
@HyukjinKwon @attilapiros
[SPARK-30076][BUILD][TESTS] Upgrade Mockito to 3.1.0
898760a 
### What changes were proposed in this pull request?

We used 2.28.2 of Mockito as of apache#25139 because 3.0.0 might be unstable. Now 3.1.0 is released.

See release notes - https://github.com/mockito/mockito/blob/v3.1.0/doc/release-notes/official.md

### Why are the changes needed?

To bring the fixes made in the dependency.

### Does this PR introduce any user-facing change?

No.

### How was this patch tested?

Jenkins will test.

Closes apache#26707 from HyukjinKwon/upgrade-Mockito.

Authored-by: HyukjinKwon <[email protected]>
Signed-off-by: Sean Owen <[email protected]>
@HyukjinKwon HyukjinKwon deleted the upgrade-Mockito branch March 3, 2020 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@srowen srowen srowen approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@HyukjinKwon @SparkQA @shahidki31 @srowen @dongjoon-hyun