Fixes after @ph review

Fixes #5917

qa/integration/framework/fixture.rb

@@ -3,6 +3,8 @@ require_relative "../services/service_locator"
 # A class that holds all fixtures for a given test file. This deals with
 # bootstrapping services, dealing with config files, inputs etc
 class Fixture
+  FIXTURES_DIR = File.expand_path(File.join("..", "..", "fixtures"), __FILE__)
+
   attr_reader :input
   attr_reader :actual_output
   attr_reader :test_dir
@@ -21,13 +23,10 @@ class Fixture
 
   def initialize(test_file_location)
     @test_file_location = test_file_location
-    @fixtures_dir = File.expand_path(File.join("..", "..", "fixtures"), __FILE__)
     @settings = TestSettings.new(@test_file_location)
     @service_locator = ServiceLocator.new(@settings)
     setup_services
-    @input = File.join(@fixtures_dir, @settings.get("input")) if @settings.is_set?("input")
+    @input = File.join(FIXTURES_DIR, @settings.get("input")) if @settings.is_set?("input")
-    # this assumes current PWD.
-    # TODO: Remove this when we have an erb template for LS config so you can inject such stuff
     @actual_output = @settings.get("actual_output")
   end
 
@@ -74,7 +73,7 @@ class Fixture
     end
     if @settings.is_set?("setup_script")
       puts "Setting up test specific fixtures"
-      script = File.join(@fixtures_dir, @settings.get("setup_script"))
+      script = File.join(FIXTURES_DIR, @settings.get("setup_script"))
       `#{script}`
     end
   end

qa/integration/framework/settings.rb

@@ -2,17 +2,17 @@ require 'yaml'
 
 # All settings for a test, global and per test
 class TestSettings
+  # Setting for the entire test suite
+  INTEG_TESTS_DIR = File.expand_path(File.join("..", ".."), __FILE__)
+  # Test specific settings
+  SUITE_SETTINGS_FILE = File.join(INTEG_TESTS_DIR, "suite.yml")
+  FIXTURES_DIR = File.join(INTEG_TESTS_DIR, "fixtures")
 
   def initialize(test_file_path)
-    # Setting for the entire test suite
-    integ_tests_dir = File.expand_path(File.join("..", ".."), __FILE__)
-    @suite_settings_file = File.join(integ_tests_dir, "suite.yml")
-    # Test specific settings
-    fixtures_dir = File.join(integ_tests_dir, "fixtures")
     test_name = File.basename(test_file_path, ".*" )
-    @tests_settings_file = File.join(fixtures_dir, "#{test_name}.yml")
+    @tests_settings_file = File.join(FIXTURES_DIR, "#{test_name}.yml")
     # Global suite settings
-    @suite_settings = YAML.load_file(@suite_settings_file)
+    @suite_settings = YAML.load_file(SUITE_SETTINGS_FILE)
     # Per test settings, where one can override stuff and define test specific config
     @test_settings = YAML.load_file(@tests_settings_file)
 

qa/integration/integration_tests.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'manticore'
   s.add_development_dependency 'stud'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'logstash-devutils'
 end

qa/integration/services/elasticsearch_setup.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 set -ex
 current_dir="$(dirname "$0")"
-source "${current_dir}/helpers.sh"
 
 if [ -n "${ES_VERSION+1}" ]; then
   echo "Elasticsearch version is $ES_VERSION"
@@ -10,5 +9,30 @@ else
    version=5.0.0-alpha5
 fi
 
+setup_es() {
+  if [ ! -d $current_dir/elasticsearch ]; then
+      local version=$1
+      download_url=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$version/elasticsearch-$version.tar.gz
+      curl -sL $download_url > $current_dir/elasticsearch.tar.gz
+      mkdir $current_dir/elasticsearch
+      tar -xzf $current_dir/elasticsearch.tar.gz --strip-components=1 -C $current_dir/elasticsearch/.
+      rm $current_dir/elasticsearch.tar.gz
+  fi
+}
+
+start_es() {
+  es_args=$@
+  $current_dir/elasticsearch/bin/elasticsearch $es_args -p $current_dir/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null &
+  count=120
+  echo "Waiting for elasticsearch to respond..."
+  while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do
+      count=$(( $count - 1 ))
+      [[ $count -eq 0 ]] && return 1
+      sleep 1
+  done
+  echo "Elasticsearch is Up !"
+  return 0
+}
+
 setup_es $version
 start_es

qa/integration/services/elasticsearch_teardown.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 
 my_dir="$(dirname "$0")"
-source "$my_dir/helpers.sh"
+
+stop_es() {
+    pid=$(cat $current_dir/elasticsearch.pid)
+    [ "x$pid" != "x" ] && [ "$pid" -gt 0 ]
+    kill -SIGTERM $pid
+}
 
 stop_es

qa/integration/services/helpers.sh

@@ -1,62 +0,0 @@
-#! /bin/bash
-
-current_dir="$(dirname "$0")"
-
-setup_es() {
-  if [ ! -d $current_dir/elasticsearch ]; then
-      local version=$1
-      download_url=https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$version/elasticsearch-$version.tar.gz
-      curl -sL $download_url > $current_dir/elasticsearch.tar.gz
-      mkdir $current_dir/elasticsearch
-      tar -xzf $current_dir/elasticsearch.tar.gz --strip-components=1 -C $current_dir/elasticsearch/.
-      rm $current_dir/elasticsearch.tar.gz
-  fi
-}
-
-start_es() {
-  es_args=$@
-  $current_dir/elasticsearch/bin/elasticsearch $es_args -p $current_dir/elasticsearch.pid > /tmp/elasticsearch.log 2>/dev/null &
-  count=120
-  echo "Waiting for elasticsearch to respond..."
-  while ! curl --silent localhost:9200 && [[ $count -ne 0 ]]; do
-      count=$(( $count - 1 ))
-      [[ $count -eq 0 ]] && return 1
-      sleep 1
-  done
-  echo "Elasticsearch is Up !"
-  return 0
-}
-
-stop_es() {
-    pid=$(cat $current_dir/elasticsearch.pid)
-    [ "x$pid" != "x" ] && [ "$pid" -gt 0 ]
-    kill -SIGTERM $pid
-}
-
-setup_kafka() {
-    local version=$1
-    if [ ! -d $current_dir/kafka ]; then
-        echo "Downloading Kafka version $version"
-        curl -s -o $current_dir/kafka.tgz "http://ftp.wayne.edu/apache/kafka/$version/kafka_2.11-$version.tgz"
-        mkdir $current_dir/kafka && tar xzf $current_dir/kafka.tgz -C $current_dir/kafka --strip-components 1
-        rm $current_dir/kafka.tgz
-    fi
-}
-
-start_kafka() {
-    echo "Starting ZooKeeper"
-    $current_dir/kafka/bin/zookeeper-server-start.sh -daemon $current_dir/kafka/config/zookeeper.properties
-    sleep 3
-    echo "Starting Kafka broker"
-    $current_dir/kafka/bin/kafka-server-start.sh -daemon $current_dir/kafka/config/server.properties --override delete.topic.enable=true
-    sleep 3
-}
-
-stop_kafka() {
-    echo "Stopping Kafka broker"
-    $current_dir/kafka/bin/kafka-server-stop.sh
-    sleep 2
-    echo "Stopping zookeeper"
-    $current_dir/kafka/bin/zookeeper-server-stop.sh
-    sleep 2
-}

qa/integration/services/kafka_setup.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 set -ex
 current_dir="$(dirname "$0")"
-source "${current_dir}/helpers.sh"
 
 if [ -n "${KAFKA_VERSION+1}" ]; then
     echo "KAFKA_VERSION is $KAFKA_VERSION"
@@ -10,6 +9,25 @@ else
     version=0.10.0.0
 fi
 
+setup_kafka() {
+    local version=$1
+    if [ ! -d $current_dir/kafka ]; then
+        echo "Downloading Kafka version $version"
+        curl -s -o $current_dir/kafka.tgz "http://ftp.wayne.edu/apache/kafka/$version/kafka_2.11-$version.tgz"
+        mkdir $current_dir/kafka && tar xzf $current_dir/kafka.tgz -C $current_dir/kafka --strip-components 1
+        rm $current_dir/kafka.tgz
+    fi
+}
+
+start_kafka() {
+    echo "Starting ZooKeeper"
+    $current_dir/kafka/bin/zookeeper-server-start.sh -daemon $current_dir/kafka/config/zookeeper.properties
+    sleep 3
+    echo "Starting Kafka broker"
+    $current_dir/kafka/bin/kafka-server-start.sh -daemon $current_dir/kafka/config/server.properties --override delete.topic.enable=true
+    sleep 3
+}
+
 setup_kafka $version
 start_kafka
 

qa/integration/services/kafka_teardown.sh

@@ -1,7 +1,15 @@
 #!/bin/bash
 set -ex
 current_dir="$(dirname "$0")"
-source "${current_dir}/helpers.sh"
+
+stop_kafka() {
+    echo "Stopping Kafka broker"
+    $current_dir/kafka/bin/kafka-server-stop.sh
+    sleep 2
+    echo "Stopping zookeeper"
+    $current_dir/kafka/bin/zookeeper-server-stop.sh
+    sleep 2
+}
 
 # delete test topic
 echo "Deleting test topic in Kafka"

qa/integration/services/logstash_service.rb

@@ -3,10 +3,14 @@ require_relative "monitoring_api"
 require "childprocess"
 require "bundler"
 require "tempfile"
+require 'yaml'
 
 # A locally started Logstash service
 class LogstashService < Service
 
+  LS_VERSION_FILE = File.expand_path(File.join("../../../",versions.yml), __FILE__)
+  LS_BIN = "bin/logstash"
+
   STDIN_CONFIG = "input {stdin {}} output { }"
   RETRY_ATTEMPTS = 10
 
@@ -20,12 +24,14 @@ class LogstashService < Service
       @logstash_home = @settings.get("ls_home_abs_path")
     else
       # use the LS which was just built in source repo
-      ls_file = "logstash-" + @settings.get("ls_version")
+      ls_version_file = YAML.load_file(LS_VERSION_FILE)
-      ls_file += "-SNAPSHOT" if @settings.get("snapshot")
+      ls_file = "logstash-" + ls_version_file["logstash"]
-      @logstash_home = File.expand_path(File.join("../../../../build",ls_file), __FILE__)
+      # First try without the snapshot if it's there
+      @logstash_home = File.expand_path(File.join("../../../../build", ls_file), __FILE__)
+      @logstash_home += "-SNAPSHOT" unless Dir.exists?(@logstash_home)
 
       puts "Using #{@logstash_home} as LS_HOME"
-      @logstash_bin = File.join("#{@logstash_home}", "bin/logstash")
+      @logstash_bin = File.join("#{@logstash_home}", LS_BIN)
       raise "Logstash binary not found in path #{@logstash_home}" unless File.file? @logstash_bin
     end
 

qa/integration/specs/es_output_how_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
-require_relative '../services/logstash'
+require_relative '../services/logstash_service'
 
 describe "a config which indexes data into Elasticsearch", :integration => true do
 

qa/integration/specs/kafka_input_spec.rb

@@ -1,6 +1,6 @@
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
-require_relative '../services/logstash'
+require_relative '../services/logstash_service'
 require "rspec/wait"
 
 describe "Kafka Input", :integration => true do

qa/integration/specs/monitoring_api_spec.rb

@@ -1,6 +1,7 @@
 require_relative '../framework/fixture'
 require_relative '../framework/settings'
-require_relative '../services/logstash'
+require_relative '../services/logstash_service'
+require "logstash/devutils/rspec/spec_helper"
 
 describe "Monitoring API", :integration => true do
   before(:all) {
@@ -15,10 +16,9 @@ describe "Monitoring API", :integration => true do
     logstash_service = @fixture.get_service("logstash")
     logstash_service.start_with_stdin
     5.times { logstash_service.write_to_stdin("Hello world") }
-    # TODO: get rid of this sleep, or loop
-    sleep 3
     # check metrics
     result = logstash_service.monitoring_api.event_stats
+    try { expect(result["in"]).to eq(5) }
     expect(result["in"]).to eq(5)
   end