You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/11/16 18:09:52 UTC

[2/5] flink git commit: Revert "[hotfix] [cassandra] [tests] Show error log messages"

Revert "[hotfix] [cassandra] [tests] Show error log messages"

This reverts commit 1adefee2eff9c9b4267f5b5e10022255cfcaf47a.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cf785422
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cf785422
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cf785422

Branch: refs/heads/master
Commit: cf78542232e9bed62fbb1a0de568bf26adbdb098
Parents: a66e7ad
Author: Stephan Ewen <se...@apache.org>
Authored: Wed Nov 16 17:58:24 2016 +0100
Committer: Stephan Ewen <se...@apache.org>
Committed: Wed Nov 16 19:08:07 2016 +0100

----------------------------------------------------------------------
 .../connectors/cassandra/CassandraConnectorITCase.java         | 6 +-----
 .../src/test/resources/log4j-test.properties                   | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/cf785422/flink-streaming-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java b/flink-streaming-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java
index acfe848..258ef52 100644
--- a/flink-streaming-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java
+++ b/flink-streaming-connectors/flink-connector-cassandra/src/test/java/org/apache/flink/streaming/connectors/cassandra/CassandraConnectorITCase.java
@@ -161,11 +161,7 @@ public class CassandraConnectorITCase extends WriteAheadSinkTestBase<Tuple3<Stri
 
 		if (EMBEDDED) {
 			if (cassandra != null) {
-				try {
-					cassandra.destroy();
-				} catch (IllegalStateException ignored) {
-					// the process was never started
-				}
+				cassandra.destroy();
 			}
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/cf785422/flink-streaming-connectors/flink-connector-cassandra/src/test/resources/log4j-test.properties
----------------------------------------------------------------------
diff --git a/flink-streaming-connectors/flink-connector-cassandra/src/test/resources/log4j-test.properties b/flink-streaming-connectors/flink-connector-cassandra/src/test/resources/log4j-test.properties
index 0a630f4..a43d556 100644
--- a/flink-streaming-connectors/flink-connector-cassandra/src/test/resources/log4j-test.properties
+++ b/flink-streaming-connectors/flink-connector-cassandra/src/test/resources/log4j-test.properties
@@ -16,7 +16,7 @@
 # limitations under the License.
 ################################################################################
 
-log4j.rootLogger=ERROR, testlogger
+log4j.rootLogger=OFF, testlogger
 
 log4j.appender.testlogger=org.apache.log4j.ConsoleAppender
 log4j.appender.testlogger.target= System.err