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

TEZ-4383: upgrade to mockito 4.3.1 #190

Merged
merged 3 commits into from
Jun 6, 2022
Merged

Conversation

LA-Toth
Copy link
Contributor

@LA-Toth LA-Toth commented Feb 16, 2022

No description provided.

@tez-yetus

This comment was marked as outdated.

deserialized.readFields(new DataInputStream(new ByteArrayInputStream(bos.toByteArray())));
verifyResults(entityDescriptor, deserialized, payload, confVal);
}

@Test (timeout=1000)
@Test (timeout=3000)
Copy link
Contributor

Choose a reason for hiding this comment

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

is this change needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure. Initially this test timed out with the original timeout value. I double check this one.

import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
Copy link
Contributor

Choose a reason for hiding this comment

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

please remove wildcard import, we usually refrain from doing that
by removing it we can stay consistent with other parts of the code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Cool, OK, consistency is also important for me.
But the tests don't always do that, namely the any() and the other matchers can be imported both as org.mockito.Mockito.any and as org.mockito.ArgumentMatchers.any. I would keep only one of these. The org.mockito.Mockito.any seems to be the better choice.

Copy link
Contributor

Choose a reason for hiding this comment

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

this looks confusing from mockito side, can you please clarify the difference between them?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

These are the same. Basically the same code (function) is added to both the ArgumentMatchers and the Mockito classes. So in theory there is no real difference.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus

This comment was marked as outdated.

@tez-yetus
Copy link

💔 -1 overall

Vote Subsystem Runtime Comment
+0 🆗 reexec 16m 44s Docker mode activated.
_ Prechecks _
+1 💚 dupname 0m 1s No case conflicting files found.
+1 💚 @author 0m 0s The patch does not contain any @author tags.
+1 💚 test4tests 0m 0s The patch appears to include 61 new or modified test files.
_ master Compile Tests _
+0 🆗 mvndep 6m 33s Maven dependency ordering for branch
+1 💚 mvninstall 10m 11s master passed
+1 💚 compile 11m 58s master passed with JDK Private Build-11.0.15+10-Ubuntu-0ubuntu0.20.04.1
+1 💚 compile 11m 8s master passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚 checkstyle 9m 23s master passed
+1 💚 javadoc 10m 41s master passed with JDK Private Build-11.0.15+10-Ubuntu-0ubuntu0.20.04.1
+1 💚 javadoc 9m 44s master passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+0 🆗 spotbugs 0m 51s Used deprecated FindBugs config; considering switching to SpotBugs.
+0 🆗 findbugs 6m 23s root in master has 2 extant findbugs warnings.
+0 🆗 findbugs 0m 50s tez-tools/analyzers/job-analyzer in master has 4 extant findbugs warnings.
_ Patch Compile Tests _
+0 🆗 mvndep 0m 21s Maven dependency ordering for patch
-1 ❌ mvninstall 0m 20s tez-runtime-library in the patch failed.
-1 ❌ mvninstall 0m 17s tez-protobuf-history-plugin in the patch failed.
+1 💚 compile 11m 57s the patch passed with JDK Private Build-11.0.15+10-Ubuntu-0ubuntu0.20.04.1
+1 💚 javac 11m 57s the patch passed
+1 💚 compile 11m 6s the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚 javac 11m 6s the patch passed
+1 💚 checkstyle 0m 33s The patch passed checkstyle in tez-api
+1 💚 checkstyle 0m 29s The patch passed checkstyle in tez-common
+1 💚 checkstyle 0m 31s The patch passed checkstyle in tez-runtime-internals
+1 💚 checkstyle 0m 43s tez-runtime-library: The patch generated 0 new + 310 unchanged - 23 fixed = 310 total (was 333)
+1 💚 checkstyle 0m 32s The patch passed checkstyle in tez-mapreduce
+1 💚 checkstyle 0m 55s tez-dag: The patch generated 0 new + 675 unchanged - 7 fixed = 675 total (was 682)
+1 💚 checkstyle 0m 29s The patch passed checkstyle in tez-ext-service-tests
+1 💚 checkstyle 0m 30s The patch passed checkstyle in tez-protobuf-history-plugin
+1 💚 checkstyle 0m 30s tez-plugins/tez-yarn-timeline-history: The patch generated 0 new + 38 unchanged - 19 fixed = 38 total (was 57)
+1 💚 checkstyle 0m 29s The patch passed checkstyle in tez-yarn-timeline-history-with-acls
+1 💚 checkstyle 0m 29s tez-plugins/tez-yarn-timeline-history-with-fs: The patch generated 0 new + 22 unchanged - 3 fixed = 22 total (was 25)
+1 💚 checkstyle 0m 29s The patch passed checkstyle in tez-history-parser
+1 💚 checkstyle 0m 31s The patch passed checkstyle in tez-aux-services
+1 💚 checkstyle 0m 29s The patch passed checkstyle in job-analyzer
+1 💚 checkstyle 1m 25s root: The patch generated 0 new + 1195 unchanged - 52 fixed = 1195 total (was 1247)
+1 💚 whitespace 0m 0s The patch has no whitespace issues.
+1 💚 xml 0m 18s The patch has no ill-formed XML file.
+1 💚 javadoc 10m 38s the patch passed with JDK Private Build-11.0.15+10-Ubuntu-0ubuntu0.20.04.1
+1 💚 javadoc 9m 43s the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚 findbugs 21m 16s the patch passed
_ Other Tests _
+1 💚 unit 2m 32s tez-api in the patch passed.
+1 💚 unit 0m 46s tez-common in the patch passed.
+1 💚 unit 0m 58s tez-runtime-internals in the patch passed.
+1 💚 unit 5m 15s tez-runtime-library in the patch passed.
+1 💚 unit 1m 39s tez-mapreduce in the patch passed.
+1 💚 unit 5m 21s tez-dag in the patch passed.
+1 💚 unit 4m 16s tez-ext-service-tests in the patch passed.
+1 💚 unit 0m 45s tez-protobuf-history-plugin in the patch passed.
+1 💚 unit 1m 54s tez-yarn-timeline-history in the patch passed.
+1 💚 unit 2m 7s tez-yarn-timeline-history-with-acls in the patch passed.
+1 💚 unit 1m 53s tez-yarn-timeline-history-with-fs in the patch passed.
+1 💚 unit 2m 42s tez-history-parser in the patch passed.
+1 💚 unit 3m 2s tez-aux-services in the patch passed.
+1 💚 unit 2m 59s job-analyzer in the patch passed.
+1 💚 unit 71m 4s root in the patch passed.
+1 💚 asflicense 8m 23s The patch does not generate ASF License warnings.
310m 54s
Subsystem Report/Notes
Docker ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/tez-multibranch/job/PR-190/10/artifact/out/Dockerfile
GITHUB PR #190
JIRA Issue TEZ-4383
Optional Tests dupname asflicense javac javadoc unit xml compile spotbugs findbugs checkstyle
uname Linux 70720f1c102e 4.15.0-175-generic #184-Ubuntu SMP Thu Mar 24 17:48:36 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Build tool maven
Personality personality/tez.sh
git revision master / cf9e3ff
Default Java Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions /usr/lib/jvm/java-11-openjdk-amd64:Private Build-11.0.15+10-Ubuntu-0ubuntu0.20.04.1 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
mvninstall https://ci-hadoop.apache.org/job/tez-multibranch/job/PR-190/10/artifact/out/patch-mvninstall-tez-runtime-library.txt
mvninstall https://ci-hadoop.apache.org/job/tez-multibranch/job/PR-190/10/artifact/out/patch-mvninstall-tez-plugins_tez-protobuf-history-plugin.txt
Test Results https://ci-hadoop.apache.org/job/tez-multibranch/job/PR-190/10/testReport/
Max. process+thread count 2089 (vs. ulimit of 5500)
modules C: tez-api tez-common tez-runtime-internals tez-runtime-library tez-mapreduce tez-dag tez-ext-service-tests tez-plugins/tez-protobuf-history-plugin tez-plugins/tez-yarn-timeline-history tez-plugins/tez-yarn-timeline-history-with-acls tez-plugins/tez-yarn-timeline-history-with-fs tez-plugins/tez-history-parser tez-plugins/tez-aux-services tez-tools/analyzers/job-analyzer . U: .
Console output https://ci-hadoop.apache.org/job/tez-multibranch/job/PR-190/10/console
versions git=2.25.1 maven=3.6.3 findbugs=3.0.1
Powered by Apache Yetus 0.12.0 https://yetus.apache.org

This message was automatically generated.

@abstractdog
Copy link
Contributor

mvn install failures are not related, patch LGTM, let's merge the change and then we can see if the issue persists

@abstractdog abstractdog self-requested a review June 6, 2022 19:49
@abstractdog abstractdog merged commit e5a5578 into apache:master Jun 6, 2022
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.

3 participants