> On Dec. 20, 2016, 7:31 p.m., Nate Cole wrote: > > I don't seem to be getting a clean merge with this diff.
Yes, the change comitted in the meantime for AMBARI-19195 introduced conflict. - Attila ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/54904/#review159736 ----------------------------------------------------------- On Dec. 20, 2016, 9:26 p.m., Attila Doroszlai wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/54904/ > ----------------------------------------------------------- > > (Updated Dec. 20, 2016, 9:26 p.m.) > > > Review request for Ambari, Jonathan Hurley, Laszlo Puskas, and Nate Cole. > > > Bugs: AMBARI-19149 > https://issues.apache.org/jira/browse/AMBARI-19149 > > > Repository: ambari > > > Description > ------- > > * It turned out that the Checkstyle Maven plugin [does not check test sources > by > default](http://maven.apache.org/plugins/maven-checkstyle-plugin/check-mojo.html#includeTestSourceDirectory). > * Fixed violations in `src/test/java`. > * Also removed unnecessary `checkstyle.skip` property and [`skip` > parameter](http://maven.apache.org/plugins/maven-checkstyle-plugin/check-mojo.html#skip), > since the default behavior exactly matches this. > > > Diffs > ----- > > ambari-project/pom.xml f3476d7132a9d866e624f1430572d802360ae4be > ambari-server/checkstyle.xml 0742284c66db396a288962cb8faf9fdd775498e8 > > ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java > 97342128e485fa8647efd7a8bb00d63601371682 > > ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java > a7f8a21672f164db108be5e330d560c1e08a4d03 > > ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java > 360509cc901773f58c655af0ef358b1fdf889a52 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java > 438e073a62ab90a3ddf4ba59b73920eda74e4516 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProviderTest.java > baec7dfcd8838300afcd4da0aaa457a5ba9b97d8 > > ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogQueryResponseTest.java > 527306c3f109ec94c35b9e0a11c40b2b8c1daa4a > > ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LogSearchDataRetrievalServiceTest.java > 1b365e5c75718e65e34ee3ab2255ded13b2cd25e > > ambari-server/src/test/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImplTest.java > cb6578083259e4d4229b19c1546376bb75517298 > > ambari-server/src/test/java/org/apache/ambari/server/state/ConfigMergeHelperTest.java > 84f81e6d5b5c21dcd6502ca1ec1dc7fe5406ca65 > > ambari-server/src/test/java/org/apache/ambari/server/state/quicklinksprofile/QuickLinksProfileParserTest.java > 0644027886cda4bdca72cfaf0174152481e5944e > > ambari-server/src/test/java/org/apache/ambari/server/testing/DeadlockedThreadsTest.java > 0e99db558734ada31e64a11cf627df126a5a9205 > > ambari-server/src/test/java/org/apache/ambari/server/topology/BlueprintImplTest.java > 1ffd8f78bda5a2f9e172585566a2453a33ef9be6 > > ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterDeployWithStartOnlyTest.java > c205e57765e071efc7c4fb714d6ecb8a1f72ea4f > > ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartOnComponentLevelTest.java > b276ecf9c155e2dddecbbaa148f25e0e80c988ec > > ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterInstallWithoutStartTest.java > 58862f1f2d690d9ada1b6c4273e4dd91db52818e > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog210Test.java > 36f66c6823211f62ebdb4c241a65234670c64d6e > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java > 27b11749f22e0f7b66959ece0af07cdb0ed8a69c > > ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java > 24b457037f1c782270e4fb87ce4a24b775cf61aa > > Diff: https://reviews.apache.org/r/54904/diff/ > > > Testing > ------- > > ``` > $ files_to_test=$(git diff origin/trunk --name-only | grep Test | xargs > basename | cut -f1 -d'.' | sort | tr '\n' ',' | sed 's/,$//') > $ mvn -am -pl ambari-server clean test -DfailIfNoTests=false > -DskipPythonTests -Dtest=$files_to_test > ... > Tests run: 110, Failures: 0, Errors: 0, Skipped: 0 > ... > [INFO] Rat check: Summary of files. Unapproved: 0 unknown: 0 generated: 0 > approved: 5383 licence. > ... > [INFO] --- maven-checkstyle-plugin:2.17:check (checkstyle) @ ambari-server --- > [INFO] Starting audit... > Audit done. > [INFO] > ------------------------------------------------------------------------ > ... > [INFO] Ambari Server ..................................... SUCCESS [2:07.965s] > > $ mvn -am -pl ambari-server -DskipTests -Dcheckstyle.skip -Drat.skip test > ... > [INFO] --- maven-checkstyle-plugin:2.17:check (checkstyle) @ ambari-server --- > [INFO] > ------------------------------------------------------------------------ > ... > [INFO] Ambari Server ..................................... SUCCESS [8.035s] > ``` > > > Thanks, > > Attila Doroszlai > >
