Repository: incubator-htrace Updated Branches: refs/heads/master cab75ceea -> 94b9b539c
HTRACE-103. Reset unclosed spans after TestBadClient (iwasakims) Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/94b9b539 Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/94b9b539 Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/94b9b539 Branch: refs/heads/master Commit: 94b9b539c032f66b5fcf6627ec3bed8189b02b04 Parents: cab75ce Author: Masatake Iwasaki <[email protected]> Authored: Fri Feb 6 14:36:32 2015 -0800 Committer: Masatake Iwasaki <[email protected]> Committed: Fri Feb 6 14:36:32 2015 -0800 ---------------------------------------------------------------------- .../src/test/java/org/apache/htrace/TestBadClient.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/94b9b539/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java ---------------------------------------------------------------------- diff --git a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java index cf060d5..e13a0f8 100644 --- a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java +++ b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java @@ -23,12 +23,14 @@ import static org.hamcrest.CoreMatchers.containsString; import org.apache.htrace.HTraceConfiguration; import org.apache.htrace.Span; import org.apache.htrace.SpanReceiver; +import org.apache.htrace.Tracer; import org.apache.htrace.TraceTree.SpansByParent; import org.apache.htrace.TraceTree; import org.apache.htrace.impl.AlwaysSampler; import org.apache.htrace.impl.LocalFileSpanReceiver; import org.apache.htrace.impl.POJOSpanReceiver; import org.apache.htrace.impl.StandardOutSpanReceiver; +import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -57,7 +59,6 @@ public class TestBadClient { assertTrue("Expected to get exception because of improper " + "scope closure.", gotException); innerScope.close(); - Tracer.getInstance().setCurrentSpan(null); } /** @@ -147,4 +148,9 @@ public class TestBadClient { assertTrue("Expected to get exception because of incorrect startSpan.", gotException); } + + @After + public void resetCurrentSpan() { + Tracer.getInstance().setCurrentSpan(null); + } }
