Merge branch 1.5 into 1.6

lutovich · lutovich · commit bccc2341cebd · 2018-04-20T15:50:58.000+02:00
diff --git a/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java b/driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java
@@ -21,7 +21,6 @@
 import io.netty.channel.Channel;
 import org.junit.After;
 import org.junit.AfterClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -409,7 +408,6 @@ public String apply( Session session )
     }
 
     @Test
-    @Ignore
     public void shouldNotServeWritesWhenMajorityOfCoresAreDead() throws Exception
     {
         Cluster cluster = clusterRule.getCluster();
@@ -441,7 +439,6 @@ public void shouldNotServeWritesWhenMajorityOfCoresAreDead() throws Exception
     }
 
     @Test
-    @Ignore
     public void shouldServeReadsWhenMajorityOfCoresAreDead() throws Exception
     {
         Cluster cluster = clusterRule.getCluster();

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`import io.netty.channel.Channel;`
`22`	`22`	`import org.junit.After;`
`23`	`23`	`import org.junit.AfterClass;`
`24`		`-import org.junit.Ignore;`
`25`	`24`	`import org.junit.Rule;`
`26`	`25`	`import org.junit.Test;`
`27`	`26`
`@@ -409,7 +408,6 @@ public String apply( Session session )`
`409`	`408`	`}`
`410`	`409`
`411`	`410`	`@Test`
`412`		`- @Ignore`
`413`	`411`	`public void shouldNotServeWritesWhenMajorityOfCoresAreDead() throws Exception`
`414`	`412`	`{`
`415`	`413`	`Cluster cluster = clusterRule.getCluster();`
`@@ -441,7 +439,6 @@ public void shouldNotServeWritesWhenMajorityOfCoresAreDead() throws Exception`
`441`	`439`	`}`
`442`	`440`
`443`	`441`	`@Test`
`444`		`- @Ignore`
`445`	`442`	`public void shouldServeReadsWhenMajorityOfCoresAreDead() throws Exception`
`446`	`443`	`{`
`447`	`444`	`Cluster cluster = clusterRule.getCluster();`