Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c16580b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c16580b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c16580b Branch: refs/heads/master Commit: 3c16580b6f59d09018bfccdc3fb0e22f3fb96654 Parents: ea49687 a4afd1b Author: Christopher Tubbs <[email protected]> Authored: Thu Sep 1 15:03:56 2016 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Thu Sep 1 15:03:56 2016 -0400 ---------------------------------------------------------------------- TESTING.md | 26 +++++++++++---- maven-plugin/src/it/plugin-test/pom.xml | 12 +++++++ pom.xml | 33 ++++++-------------- .../harness/AccumuloClusterHarness.java | 4 +-- .../accumulo/harness/SharedMiniClusterBase.java | 4 +-- .../org/apache/accumulo/test/InMemoryMapIT.java | 11 +++++-- .../org/apache/accumulo/test/NamespacesIT.java | 4 +-- .../org/apache/accumulo/test/ShellServerIT.java | 4 +++ .../test/categories/AnyClusterTest.java | 25 --------------- .../test/categories/MiniClusterOnlyTest.java | 24 -------------- .../test/categories/MiniClusterOnlyTests.java | 22 +++++++++++++ .../StandaloneCapableClusterTests.java | 23 ++++++++++++++ .../accumulo/test/categories/SunnyDayTests.java | 23 ++++++++++++++ .../accumulo/test/functional/ClassLoaderIT.java | 4 +-- .../test/functional/ConfigurableMacBase.java | 4 +-- .../accumulo/test/functional/ExamplesIT.java | 4 +++ .../accumulo/test/functional/KerberosIT.java | 4 +-- .../test/functional/KerberosProxyIT.java | 4 +-- .../test/functional/KerberosRenewalIT.java | 4 +-- .../accumulo/test/functional/NativeMapIT.java | 3 ++ .../accumulo/test/functional/PermissionsIT.java | 4 +-- .../accumulo/test/functional/ReadWriteIT.java | 4 +++ .../accumulo/test/functional/TableIT.java | 4 +-- .../accumulo/test/proxy/TCompactProxyIT.java | 7 +++-- .../test/replication/CyclicReplicationIT.java | 9 +++--- .../test/replication/KerberosReplicationIT.java | 4 +-- .../accumulo/test/start/KeywordStartIT.java | 3 ++ 27 files changed, 167 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c16580b/maven-plugin/src/it/plugin-test/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c16580b/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 3d408c8,afd134b..4492e92 --- a/pom.xml +++ b/pom.xml @@@ -132,6 -129,9 +128,8 @@@ <eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle> <!-- extra release args for testing --> <extraReleaseArgs /> + <failsafe.excludedGroups>${accumulo.performanceTests}</failsafe.excludedGroups> + <failsafe.groups /> - <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer --> <findbugs.version>3.0.3</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> http://git-wip-us.apache.org/repos/asf/accumulo/blob/3c16580b/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------
