JAMES-2563 Fixed the tests, the DockerCassandra was not executing the commands
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4231ebfa Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4231ebfa Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4231ebfa Branch: refs/heads/master Commit: 4231ebfa79836ac40c76a03c48304243067f52f1 Parents: aa83f47 Author: matzepan <[email protected]> Authored: Wed Oct 24 22:32:33 2018 +0200 Committer: Benoit Tellier <[email protected]> Committed: Mon Oct 29 19:15:01 2018 +0700 ---------------------------------------------------------------------- .../backends/cassandra/DockerCassandra.java | 4 ++-- .../utils/CassandraHealthCheckTest.java | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/4231ebfa/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java index 72b916f..f66d483 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/DockerCassandra.java @@ -84,11 +84,11 @@ public class DockerCassandra { } public void pause() { - client.pauseContainerCmd(cassandraContainer.getContainerId()); + client.pauseContainerCmd(cassandraContainer.getContainerId()).exec(); } public void unpause() { - client.unpauseContainerCmd(cassandraContainer.getContainerId()); + client.unpauseContainerCmd(cassandraContainer.getContainerId()).exec(); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/4231ebfa/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java index 373353c..7ea8ae6 100644 --- a/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java +++ b/backends-common/cassandra/src/test/java/org/apache/james/backends/cassandra/utils/CassandraHealthCheckTest.java @@ -49,20 +49,26 @@ public class CassandraHealthCheckTest { @Test void checkShouldReturnUnhealthyWhenCassandraIsNotRunning(DockerCassandraExtension.DockerCassandra cassandraServer) { - cassandraServer.getContainer().pause(); + try{ + cassandraServer.getContainer().pause(); + Result check = healthCheck.check(); - Result check = healthCheck.check(); + assertThat(check.isUnHealthy()).isTrue(); + } finally { + cassandraServer.getContainer().unpause(); + } - assertThat(check.isUnHealthy()).isTrue(); } @Test void checkShouldDetectWhenCassandraRecovered(DockerCassandraExtension.DockerCassandra cassandraServer) { - cassandraServer.getContainer().pause(); - - healthCheck.check(); + try { + cassandraServer.getContainer().pause(); - cassandraServer.getContainer().unpause(); + healthCheck.check(); + } finally { + cassandraServer.getContainer().unpause(); + } Result check = healthCheck.check(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
