You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/01/15 19:30:40 UTC
[1/3] storm git commit: [STORM-2894] rename
MultilangEnvirontmentTest.java to MultilangEnvironmentTest.java
Repository: storm
Updated Branches:
refs/heads/master 4b28a60a3 -> ee0c36dd3
[STORM-2894] rename MultilangEnvirontmentTest.java to MultilangEnvironmentTest.java
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7b849e20
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7b849e20
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7b849e20
Branch: refs/heads/master
Commit: 7b849e20704fe6d51c01fd543fdf78f1989e04b4
Parents: 466a7ad
Author: Erik Weathers <er...@gmail.com>
Authored: Wed Jan 10 00:08:24 2018 -0800
Committer: Erik Weathers <er...@gmail.com>
Committed: Wed Jan 10 00:08:24 2018 -0800
----------------------------------------------------------------------
.../multilang/MultilangEnvironmentTest.java | 89 ++++++++++++++++++++
.../multilang/MultilangEnvirontmentTest.java | 89 --------------------
2 files changed, 89 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7b849e20/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
----------------------------------------------------------------------
diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
new file mode 100644
index 0000000..dcded17
--- /dev/null
+++ b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.storm.flux.multilang;
+
+
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Sanity checks to make sure we can at least invoke the shells used.
+ */
+public class MultilangEnvirontmentTest {
+ private static final Logger LOG = LoggerFactory.getLogger(MultilangEnvirontmentTest.class);
+
+ @Test
+ public void testInvokePython() throws Exception {
+ String[] command = new String[]{"python", "--version"};
+ int exitVal = invokeCommand(command);
+ assertEquals("Exit value for python is 0.", 0, exitVal);
+ }
+
+ @Test
+ public void testInvokeNode() throws Exception {
+ String[] command = new String[]{"node", "--version"};
+ int exitVal = invokeCommand(command);
+ assertEquals("Exit value for node is 0.", 0, exitVal);
+ }
+
+ private static class StreamRedirect implements Runnable {
+ private InputStream in;
+ private OutputStream out;
+
+ public StreamRedirect(InputStream in, OutputStream out) {
+ this.in = in;
+ this.out = out;
+ }
+
+ @Override
+ public void run() {
+ try {
+ int i = -1;
+ while ((i = this.in.read()) != -1) {
+ out.write(i);
+ }
+ this.in.close();
+ this.out.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private int invokeCommand(String[] args) throws Exception {
+ LOG.debug("Invoking command: {}", args);
+
+ ProcessBuilder pb = new ProcessBuilder(args);
+ pb.redirectErrorStream(true);
+ final Process proc = pb.start();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ Thread t = new Thread(new StreamRedirect(proc.getInputStream(), out));
+ t.start();
+ int exitVal = proc.waitFor();
+ LOG.debug("Command result: {}", out.toString());
+ return exitVal;
+ }
+}
http://git-wip-us.apache.org/repos/asf/storm/blob/7b849e20/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvirontmentTest.java
----------------------------------------------------------------------
diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvirontmentTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvirontmentTest.java
deleted file mode 100644
index dcded17..0000000
--- a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvirontmentTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.storm.flux.multilang;
-
-
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Sanity checks to make sure we can at least invoke the shells used.
- */
-public class MultilangEnvirontmentTest {
- private static final Logger LOG = LoggerFactory.getLogger(MultilangEnvirontmentTest.class);
-
- @Test
- public void testInvokePython() throws Exception {
- String[] command = new String[]{"python", "--version"};
- int exitVal = invokeCommand(command);
- assertEquals("Exit value for python is 0.", 0, exitVal);
- }
-
- @Test
- public void testInvokeNode() throws Exception {
- String[] command = new String[]{"node", "--version"};
- int exitVal = invokeCommand(command);
- assertEquals("Exit value for node is 0.", 0, exitVal);
- }
-
- private static class StreamRedirect implements Runnable {
- private InputStream in;
- private OutputStream out;
-
- public StreamRedirect(InputStream in, OutputStream out) {
- this.in = in;
- this.out = out;
- }
-
- @Override
- public void run() {
- try {
- int i = -1;
- while ((i = this.in.read()) != -1) {
- out.write(i);
- }
- this.in.close();
- this.out.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- private int invokeCommand(String[] args) throws Exception {
- LOG.debug("Invoking command: {}", args);
-
- ProcessBuilder pb = new ProcessBuilder(args);
- pb.redirectErrorStream(true);
- final Process proc = pb.start();
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- Thread t = new Thread(new StreamRedirect(proc.getInputStream(), out));
- t.start();
- int exitVal = proc.waitFor();
- LOG.debug("Command result: {}", out.toString());
- return exitVal;
- }
-}
[3/3] storm git commit: Merge branch 'STORM-2894' of
https://github.com/erikdw/storm into asfgit-master
Posted by sr...@apache.org.
Merge branch 'STORM-2894' of https://github.com/erikdw/storm into asfgit-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ee0c36dd
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ee0c36dd
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ee0c36dd
Branch: refs/heads/master
Commit: ee0c36dd3ed5b00e8dbe725d62945bf9702728ad
Parents: 4b28a60 515b649
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Mon Jan 15 20:30:13 2018 +0100
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Mon Jan 15 20:30:13 2018 +0100
----------------------------------------------------------------------
.../org/apache/storm/kafka/KafkaUtilsTest.java | 2 +-
.../multilang/MultilangEnvironmentTest.java | 89 ++++++++++++++++++++
.../multilang/MultilangEnvirontmentTest.java | 89 --------------------
3 files changed, 90 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
[2/3] storm git commit: [STORM-2894] complete rename of
MultilangEnvirontmentTest to MultilangEnvironmentTest,
and fix typo of Force as Froce
Posted by sr...@apache.org.
[STORM-2894] complete rename of MultilangEnvirontmentTest to MultilangEnvironmentTest, and fix typo of Force as Froce
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/515b6492
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/515b6492
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/515b6492
Branch: refs/heads/master
Commit: 515b6492d2bc185f4454975d12edf6fe7fe14d22
Parents: 7b849e2
Author: Erik Weathers <er...@gmail.com>
Authored: Wed Jan 10 00:09:00 2018 -0800
Committer: Erik Weathers <er...@gmail.com>
Committed: Wed Jan 10 00:09:00 2018 -0800
----------------------------------------------------------------------
.../src/test/org/apache/storm/kafka/KafkaUtilsTest.java | 2 +-
.../apache/storm/flux/multilang/MultilangEnvironmentTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/515b6492/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaUtilsTest.java
----------------------------------------------------------------------
diff --git a/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaUtilsTest.java b/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaUtilsTest.java
index b575bc9..1bd989f 100644
--- a/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaUtilsTest.java
+++ b/external/storm-kafka/src/test/org/apache/storm/kafka/KafkaUtilsTest.java
@@ -126,7 +126,7 @@ public class KafkaUtilsTest {
}
@Test
- public void getOffsetFromConfigAndFroceFromStart() {
+ public void getOffsetFromConfigAndForceFromStart() {
config.ignoreZkOffsets = true;
config.startOffsetTime = OffsetRequest.EarliestTime();
createTopicAndSendMessage();
http://git-wip-us.apache.org/repos/asf/storm/blob/515b6492/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
----------------------------------------------------------------------
diff --git a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
index dcded17..b5a893f 100644
--- a/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
+++ b/flux/flux-core/src/test/java/org/apache/storm/flux/multilang/MultilangEnvironmentTest.java
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertEquals;
/**
* Sanity checks to make sure we can at least invoke the shells used.
*/
-public class MultilangEnvirontmentTest {
- private static final Logger LOG = LoggerFactory.getLogger(MultilangEnvirontmentTest.class);
+public class MultilangEnvironmentTest {
+ private static final Logger LOG = LoggerFactory.getLogger(MultilangEnvironmentTest.class);
@Test
public void testInvokePython() throws Exception {