You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by az...@apache.org on 2019/11/07 21:55:52 UTC
[flink] 01/21: [hotfix] Refactor
'TaskManagerHeapSizeCalculationJavaBashTest',
abstract 'JavaBashTestBase' for executing testing bash scripts from java
classes.
This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch FLINK-13986-flip49-cleanup-e2e
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 2b9e5d9f545a136cede63bc924c03ea013029fe3
Author: Xintong Song <to...@gmail.com>
AuthorDate: Thu Sep 26 19:38:55 2019 +0800
[hotfix] Refactor 'TaskManagerHeapSizeCalculationJavaBashTest', abstract 'JavaBashTestBase' for executing testing bash scripts from java classes.
---
.../org/apache/flink/dist/JavaBashTestBase.java | 60 ++++++++++++++++++++++
...TaskManagerHeapSizeCalculationJavaBashTest.java | 34 +-----------
2 files changed, 61 insertions(+), 33 deletions(-)
diff --git a/flink-dist/src/test/java/org/apache/flink/dist/JavaBashTestBase.java b/flink-dist/src/test/java/org/apache/flink/dist/JavaBashTestBase.java
new file mode 100644
index 0000000..63faaa2
--- /dev/null
+++ b/flink-dist/src/test/java/org/apache/flink/dist/JavaBashTestBase.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.dist;
+
+import org.apache.flink.util.OperatingSystem;
+import org.apache.flink.util.TestLogger;
+
+import org.junit.Assume;
+import org.junit.BeforeClass;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Abstract test class for executing bash scripts.
+ */
+public abstract class JavaBashTestBase extends TestLogger {
+ @BeforeClass
+ public static void checkOperatingSystem() {
+ Assume.assumeTrue("This test checks shell scripts which are not available on Windows.",
+ !OperatingSystem.isWindows());
+ }
+
+ /**
+ * Executes the given shell script wrapper and returns its output.
+ *
+ * @param command command to run
+ *
+ * @return raw script output
+ */
+ protected String executeScript(final String[] command) throws IOException {
+ ProcessBuilder pb = new ProcessBuilder(command);
+ pb.redirectErrorStream(true);
+ Process process = pb.start();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+ StringBuilder sb = new StringBuilder();
+ String s;
+ while ((s = reader.readLine()) != null) {
+ sb.append(s);
+ }
+ return sb.toString();
+ }
+}
diff --git a/flink-dist/src/test/java/org/apache/flink/dist/TaskManagerHeapSizeCalculationJavaBashTest.java b/flink-dist/src/test/java/org/apache/flink/dist/TaskManagerHeapSizeCalculationJavaBashTest.java
index 0b5f5be..4f172d9 100755
--- a/flink-dist/src/test/java/org/apache/flink/dist/TaskManagerHeapSizeCalculationJavaBashTest.java
+++ b/flink-dist/src/test/java/org/apache/flink/dist/TaskManagerHeapSizeCalculationJavaBashTest.java
@@ -24,16 +24,10 @@ import org.apache.flink.configuration.NettyShuffleEnvironmentOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.taskexecutor.TaskManagerServices;
import org.apache.flink.runtime.taskmanager.NettyShuffleEnvironmentConfiguration;
-import org.apache.flink.util.OperatingSystem;
-import org.apache.flink.util.TestLogger;
-import org.junit.Assume;
-import org.junit.Before;
import org.junit.Test;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.util.Random;
import static org.hamcrest.CoreMatchers.allOf;
@@ -51,7 +45,7 @@ import static org.junit.Assert.assertThat;
* <tt>double</tt> precision but our Java code restrains to <tt>float</tt> because we actually do
* not need high precision.
*/
-public class TaskManagerHeapSizeCalculationJavaBashTest extends TestLogger {
+public class TaskManagerHeapSizeCalculationJavaBashTest extends JavaBashTestBase {
/** Key that is used by <tt>config.sh</tt>. */
private static final String KEY_TASKM_MEM_SIZE = "taskmanager.heap.size";
@@ -64,12 +58,6 @@ public class TaskManagerHeapSizeCalculationJavaBashTest extends TestLogger {
*/
private static final int NUM_RANDOM_TESTS = 20;
- @Before
- public void checkOperatingSystem() {
- Assume.assumeTrue("This test checks shell scripts which are not available on Windows.",
- !OperatingSystem.isWindows());
- }
-
/**
* Tests that {@link NettyShuffleEnvironmentConfiguration#calculateNetworkBufferMemory(long, Configuration)}
* has the same result as the shell script.
@@ -310,24 +298,4 @@ public class TaskManagerHeapSizeCalculationJavaBashTest extends TestLogger {
lessThanOrEqualTo(javaHeapSizeMB + absoluteTolerance)));
}
- /**
- * Executes the given shell script wrapper and returns its output.
- *
- * @param command command to run
- *
- * @return raw script output
- */
- private String executeScript(final String[] command) throws IOException {
- ProcessBuilder pb = new ProcessBuilder(command);
- pb.redirectErrorStream(true);
- Process process = pb.start();
- BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
- StringBuilder sb = new StringBuilder();
- String s;
- while ((s = reader.readLine()) != null) {
- sb.append(s);
- }
- return sb.toString();
- }
-
}