ACCUMULO-3419 Fix testTrace in master Not sure where the extra tracing example invocation came from, but it's unnecessary. Just need to switch over the test to account for the flipped application/host pair from cloudtrace->htrace.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5427a590 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5427a590 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5427a590 Branch: refs/heads/master Commit: 5427a59048ece3f69a8d7a7a4d45cb4eb91b1e55 Parents: 3356e0b Author: Josh Elser <[email protected]> Authored: Mon Dec 15 11:41:32 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Mon Dec 15 11:41:32 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/test/functional/ExamplesIT.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/5427a590/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java index 86ad0bc..b47c9ca 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java @@ -169,10 +169,7 @@ public class ExamplesIT extends AccumuloClusterIT { count++; } assertTrue(count > 0); - pair = cluster.getClusterControl().execWithStdout(TracingExample.class, - new String[] {"-i", instance, "-z", keepers, "-u", user, "-p", passwd, "-C", "-D", "-c"}); - Assert.assertEquals("Expected return code of zero. STDOUT=" + pair.getValue(), 0, pair.getKey().intValue()); - assertTrue(pair.getValue().contains("myHost@myApp")); + assertTrue("Output did not contain myApp@myHost", pair.getValue().contains("myApp@myHost")); if (ClusterType.MINI == getClusterType() && null != trace) { trace.destroy(); }
