More work to try and fix randomly failing test # Conflicts: # rt/management-web/src/main/java/org/apache/cxf/management/web/browser/client/ui/browser/NavigationSidebarView.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/00589e44 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/00589e44 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/00589e44 Branch: refs/heads/3.1.x-fixes Commit: 00589e44810f2d8cf1a830bb80842067c73cb8c2 Parents: 49b10f7 Author: Daniel Kulp <[email protected]> Authored: Tue Feb 28 10:40:44 2017 -0500 Committer: Daniel Kulp <[email protected]> Committed: Tue Mar 7 14:02:43 2017 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/00589e44/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java ---------------------------------------------------------------------- diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java index 35c47e0..0fb98df 100644 --- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java +++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/RESTLoggingTest.java @@ -60,10 +60,11 @@ public class RESTLoggingTest { client.get(InputStream.class).close(); loggingFeature.setLogBinary(true); client.get(InputStream.class).close(); + client.close(); + server.stop(); server.destroy(); List<LogEvent> events = sender.getEvents(); - Assert.assertEquals(8, events.size()); assertLogged(events.get(0)); assertLogged(events.get(1)); assertNotLogged(events.get(2)); @@ -72,6 +73,8 @@ public class RESTLoggingTest { assertLogged(events.get(4)); assertLogged(events.get(5)); assertLogged(events.get(6)); + + Assert.assertEquals(8, events.size()); assertLogged(events.get(7)); }
