You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2019/09/27 13:59:51 UTC
[bookkeeper] branch master updated: Fix tests and upgrade libs to
make tests pass on JDK13
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new cc9d66a Fix tests and upgrade libs to make tests pass on JDK13
cc9d66a is described below
commit cc9d66aa1826f8d583a9b939a9840657877ed275
Author: Enrico Olivelli <eo...@gmail.com>
AuthorDate: Fri Sep 27 15:59:46 2019 +0200
Fix tests and upgrade libs to make tests pass on JDK13
- Upgrade Mockito and PowerMock with a version that support JDK12+
- Fix bash script tests
Reviewers: Ivan Kelly <iv...@apache.org>
This closes #2169 from eolivelli/fix/make-tests-pass-jdk13
---
pom.xml | 4 ++--
tests/scripts/src/test/bash/bk_test_bin_common.sh | 16 ++++++++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c86c8b..604ae52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,11 +149,11 @@
<libthrift9.version>0.9.3</libthrift9.version>
<lombok.version>1.18.10</lombok.version>
<lz4.version>1.3.0</lz4.version>
- <mockito.version>2.22.0</mockito.version>
+ <mockito.version>3.0.0</mockito.version>
<netty.version>4.1.32.Final</netty.version>
<netty-boringssl.version>2.0.20.Final</netty-boringssl.version>
<ostrich.version>9.1.3</ostrich.version>
- <powermock.version>2.0.0-beta.5</powermock.version>
+ <powermock.version>2.0.2</powermock.version>
<prometheus.version>0.0.21</prometheus.version>
<datasketches.version>0.8.3</datasketches.version>
<protobuf.version>3.5.1</protobuf.version>
diff --git a/tests/scripts/src/test/bash/bk_test_bin_common.sh b/tests/scripts/src/test/bash/bk_test_bin_common.sh
index 8e81f92..e41455c 100644
--- a/tests/scripts/src/test/bash/bk_test_bin_common.sh
+++ b/tests/scripts/src/test/bash/bk_test_bin_common.sh
@@ -200,8 +200,12 @@ testBuildBookieJVMOpts() {
TEST_LOG_DIR=${BK_TMPDIR}/logdir
TEST_GC_LOG_FILENAME="test-gc.log"
ACTUAL_JVM_OPTS=$(build_bookie_jvm_opts ${TEST_LOG_DIR} ${TEST_GC_LOG_FILENAME})
- EXPECTED_JVM_OPTS="-Xms1g -Xmx1g -XX:MaxDirectMemorySize=2g ${DEFAULT_BOOKIE_GC_OPTS} ${DEFAULT_BOOKIE_GC_LOGGING_OPTS} -Xloggc:${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}"
-
+ USEJDK8=$(detect_jdk8)
+ if [ "$USING_JDK8" -ne "1" ]; then
+ EXPECTED_JVM_OPTS="-Xms1g -Xmx1g -XX:MaxDirectMemorySize=2g ${DEFAULT_BOOKIE_GC_OPTS} ${DEFAULT_BOOKIE_GC_LOGGING_OPTS} -Xlog:gc=info:file=${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}::filecount=5,filesize=64m"
+ else
+ EXPECTED_JVM_OPTS="-Xms1g -Xmx1g -XX:MaxDirectMemorySize=2g ${DEFAULT_BOOKIE_GC_OPTS} ${DEFAULT_BOOKIE_GC_LOGGING_OPTS} -Xloggc:${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}"
+ fi
assertEquals "JVM OPTS is not set correctly" "${EXPECTED_JVM_OPTS}" "${ACTUAL_JVM_OPTS}"
}
@@ -211,8 +215,12 @@ testBuildCLIJVMOpts() {
TEST_LOG_DIR=${BK_TMPDIR}/logdir
TEST_GC_LOG_FILENAME="test-gc.log"
ACTUAL_JVM_OPTS=$(build_cli_jvm_opts ${TEST_LOG_DIR} ${TEST_GC_LOG_FILENAME})
- EXPECTED_JVM_OPTS="-Xms256M -Xmx512M ${DEFAULT_CLI_GC_OPTS} ${DEFAULT_CLI_GC_LOGGING_OPTS} -Xloggc:${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}"
-
+ USEJDK8=$(detect_jdk8)
+ if [ "$USING_JDK8" -ne "1" ]; then
+ EXPECTED_JVM_OPTS="-Xms256M -Xmx512M ${DEFAULT_CLI_GC_OPTS} ${DEFAULT_CLI_GC_LOGGING_OPTS} -Xlog:gc=info:file=${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}::filecount=5,filesize=64m"
+ else
+ EXPECTED_JVM_OPTS="-Xms256M -Xmx512M ${DEFAULT_CLI_GC_OPTS} ${DEFAULT_CLI_GC_LOGGING_OPTS} -Xloggc:${TEST_LOG_DIR}/${TEST_GC_LOG_FILENAME}"
+ fi
assertEquals "JVM OPTS is not set correctly" "${EXPECTED_JVM_OPTS}" "${ACTUAL_JVM_OPTS}"
}