Fix the integration test cluster and window test expectations

integration-test/config/storm.yaml

@@ -34,10 +34,13 @@ executor.metrics.frequency.secs: 3
 drpc.servers:
   - "node1"
 
+# The tests fetch worker logs from the logviewer over plain HTTP on logviewer.port
+logviewer.disable.http.binding: false
+
 supervisor.slots.ports: [6700, 6701, 6702, 6703, 6704, 6705, 6706, 6707, 6708, 6709]
 
 # Enable assertions
 nimbus.childopts: "-Xmx1024m -ea"
 supervisor.childopts: "-Xmx256m -ea"
-worker.childopts: "-Xmx%HEAP-MEM%m -XX:+PrintGCDetails -Xloggc:artifacts/gc.log -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=1M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=artifacts/heapdump -ea"
+worker.childopts: "-Xmx%HEAP-MEM%m -Xlog:gc*:artifacts/gc.log:time,uptime:filecount=10,filesize=1M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=artifacts/heapdump -ea"
 ui.childopts: "-Xmx768m -ea"

integration-test/run-it.sh

@@ -60,6 +60,13 @@ if [[ "${USER}" == "vagrant" ]]; then # install oracle jdk8 or openjdk11
     export MAVEN_OPTS="-Xmx3000m"
 else
     if [[ "${USER}" == "github" ]]; then
+        # The distribution takes public/ from storm-webapp/target/classes/WEB-INF, which this job
+        # does not build; it only has the storm-webapp jar from the build job.
+        webapp_jar=$(find ~/.m2/repository/org/apache/storm/storm-webapp -name 'storm-webapp-*.jar' \
+            -not -name '*-tests.jar' -not -name '*-sources.jar' -not -name '*-javadoc.jar' | head -1)
+        [[ -n "${webapp_jar}" ]] || die "storm-webapp jar not found in the local Maven repository"
+        mkdir -p "${STORM_SRC_DIR}/storm-webapp/target/classes"
+        unzip -q -o "${webapp_jar}" 'WEB-INF/*' -d "${STORM_SRC_DIR}/storm-webapp/target/classes"
         ( cd "${STORM_SRC_DIR}/storm-dist/binary" && mvn clean package -Dgpg.skip=true )
     fi
     # The binary build also produces the lean "storm-lite" distribution; the integration
@@ -78,10 +85,6 @@ sudo bash "${SCRIPT_DIR}/config/common.sh"
 sudo bash "${SCRIPT_DIR}/config/install-storm.sh" "$storm_binary_zip"
 # storm.yaml points ZooKeeper, Nimbus and DRPC at node1; make it resolve when the host does not already
 grep -qw node1 /etc/hosts || echo "127.0.0.1 node1" | sudo tee -a /etc/hosts
-if [[ "$TRAVIS_JDK_VERSION" == "openjdk11" ]] || [[ "${JDK_VERSION}" == "11" ]]
-then
-  cat "${SCRIPT_DIR}/config/storm-java9.yaml" | sudo tee -a /usr/share/storm/conf/storm.yaml
-fi
 export JAVA_HOME="${JAVA_HOME}"
 env
 function start_storm_process() {

integration-test/src/test/java/org/apache/storm/st/tests/window/SlidingWindowTest.java

@@ -55,6 +55,7 @@ public void testWindowCount(int windowSize, int slideSize) throws Exception {
         final String topologyName = this.getClass().getSimpleName() + "-size-window" + windowSize + "-slide" + slideSize;
         if (windowSize <= 0 || slideSize <= 0) {
             assertThrows(IllegalArgumentException.class, () -> testable.newTopology());
+            return;
         }
         topo = new TopoWrap(cluster, topologyName, testable.newTopology());
         windowVerifier.runAndVerifyCount(windowSize, slideSize, testable, topo);
@@ -83,6 +84,7 @@ public void testTimeWindow(int windowSec, int slideSec) throws Exception {
         final String topologyName = this.getClass().getSimpleName() + "-sec-window" + windowSec + "-slide" + slideSec;
         if (windowSec <= 0 || slideSec <= 0) {
             assertThrows(IllegalArgumentException.class, () -> testable.newTopology());
+            return;
         }
         topo = new TopoWrap(cluster, topologyName, testable.newTopology());
         windowVerifier.runAndVerifyTime(windowSec, slideSec, testable, topo);

integration-test/src/test/java/org/apache/storm/st/tests/window/TumblingWindowTest.java

@@ -80,6 +80,7 @@ public void testTumbleTime(int tumbleSec) throws Exception {
         final String topologyName = this.getClass().getSimpleName() + "-sec" + tumbleSec;
         if (tumbleSec <= 0) {
             assertThrows(IllegalArgumentException.class, () -> testable.newTopology());
+            return;
         }
         topo = new TopoWrap(cluster, topologyName, testable.newTopology());
         windowVerifier.runAndVerifyTime(tumbleSec, tumbleSec, testable, topo);

integration-test/src/test/java/org/apache/storm/st/wrapper/DecoratedLogLine.java

@@ -21,6 +21,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.storm.st.utils.StringDecorator;
 
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
@@ -34,7 +35,8 @@ public class DecoratedLogLine implements Comparable<DecoratedLogLine> {
     private final ZonedDateTime logDate;
     private final String data;
     private static final int DATE_LEN = "2016-05-04 23:38:10.702".length(); //format of date in worker logs
-    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+    private static final DateTimeFormatter DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+        .withZone(ZoneOffset.UTC);
 
     public DecoratedLogLine(String logLine) {
         final List<String> splitOnDecorator = Arrays.asList(StringDecorator.split2(StringUtils.strip(logLine)));