remove some log suppression

It was suprising to have this in place, better to fix the root cause of wrongful printing.
neo4j · Feb 28, 2017 · 922768d · 922768d
1 parent ab3923f
commit 922768d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/...ausal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java b/...ausal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/ClusterBindingIT.java
@@ -46,7 +46,6 @@
 import org.neo4j.kernel.lifecycle.LifecycleException;
 import org.neo4j.logging.NullLogProvider;
 import org.neo4j.test.causalclustering.ClusterRule;
-import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.fs.DefaultFileSystemRule;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -57,11 +56,9 @@
 import static org.neo4j.causalclustering.core.server.CoreServerModule.CLUSTER_ID_NAME;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.kernel.impl.store.MetaDataStore.Position.RANDOM_NUMBER;
-import static org.neo4j.test.rule.SuppressOutput.suppress;
 
 public class ClusterBindingIT
 {
-    private final SuppressOutput suppressOutput = suppress( SuppressOutput.System.err );
     private final ClusterRule clusterRule = new ClusterRule( ClusterBindingIT.class )
                         .withNumberOfCoreMembers( 3 )
                         .withNumberOfReadReplicas( 0 )
@@ -70,8 +67,7 @@ public class ClusterBindingIT
     private final DefaultFileSystemRule fileSystemRule = new DefaultFileSystemRule();
 
     @Rule
-    public RuleChain ruleChain = RuleChain.outerRule( suppressOutput )
-                                          .around( fileSystemRule ).around( clusterRule );
+    public RuleChain ruleChain = RuleChain.outerRule( fileSystemRule ).around( clusterRule );
 
     private Cluster cluster;
     private FileSystemAbstraction fs;

diff --git a/...usal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/CoreReplicationIT.java b/...usal-clustering/src/test/java/org/neo4j/causalclustering/scenarios/CoreReplicationIT.java
@@ -36,7 +36,6 @@
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.security.WriteOperationsNotAllowedException;
 import org.neo4j.test.causalclustering.ClusterRule;
-import org.neo4j.test.rule.SuppressOutput;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
@@ -50,10 +49,8 @@
 public class CoreReplicationIT
 {
     @Rule
-    public final ClusterRule clusterRule = new ClusterRule( getClass() )
-                            .withNumberOfCoreMembers( 3 ).withNumberOfReadReplicas( 0 );
-    @Rule
-    public SuppressOutput suppressOutput = SuppressOutput.suppressAll();
+    public final ClusterRule clusterRule =
+            new ClusterRule( getClass() ).withNumberOfCoreMembers( 3 ).withNumberOfReadReplicas( 0 );
 
     private Cluster cluster;
 
@@ -289,10 +286,11 @@ public void shouldBeAbleToShutdownWhenTheLeaderIsTryingToReplicateTransaction()
                     cluster.removeCoreMember( cluster.getDbWithAnyRole( Role.FOLLOWER, Role.CANDIDATE ) );
                     latch.countDown();
                 } );
+                fail( "Should have thrown" );
             }
-            catch ( Exception e )
+            catch ( Exception ignored )
             {
-                throw new RuntimeException( e );
+                // expected
             }
         } );