refactor integration test to be inside the specs directory and not in the main level

Fixes #5268
This commit is contained in:
Pere Urbon-Bayes 2016-05-10 11:30:24 +02:00
parent e31ada89eb
commit 834d52a9aa
18 changed files with 6 additions and 6 deletions

View file

@ -24,7 +24,7 @@ namespace "test" do
# logstash-core-event specs since currently this is the most complete Event and Timestamp specs
# which actually defines the Event contract and should pass regardless of the actuall underlying
# implementation.
specs = ["spec/**/*_spec.rb", "logstash-core/spec/**/*_spec.rb", "logstash-core-event/spec/**/*_spec.rb"]
specs = ["spec/unit/**/*_spec.rb", "logstash-core/spec/**/*_spec.rb", "logstash-core-event/spec/**/*_spec.rb"]
# figure if the logstash-core-event-java gem is loaded and if so add its specific specs in the core specs to run
begin
@ -112,7 +112,7 @@ namespace "test" do
integration_path = File.join(source, "integration_run")
FileUtils.rm_rf(integration_path)
exit(RSpec::Core::Runner.run([Rake::FileList["integration/**/*_spec.rb"]]))
exit(RSpec::Core::Runner.run([Rake::FileList["spec/integration/**/*_spec.rb"]]))
end
namespace "integration" do
@ -124,7 +124,7 @@ namespace "test" do
FileUtils.mkdir_p(integration_path)
puts "[integration_spec] configuring local environment for running test in #{integration_path}, if you want to change this behavior delete the directory."
exit(RSpec::Core::Runner.run([Rake::FileList["integration/**/*_spec.rb"]]))
exit(RSpec::Core::Runner.run([Rake::FileList["spec/integration/**/*_spec.rb"]]))
end
end
end

View file

@ -1,6 +1,6 @@
# Encoding: utf-8
require_relative "../spec_helper"
require_relative "../../logstash-core/lib/logstash/version"
require_relative "../../../logstash-core/lib/logstash/version"
describe "bin/logstash" do
it "returns the logstash version" do

View file

@ -1,6 +1,6 @@
# encoding: utf-8
require_relative "support/integration_test_helpers"
require_relative "../logstash-core/lib/logstash/environment"
require_relative "../../logstash-core/lib/logstash/environment"
require "fileutils"
if LogStash::Environment.windows?
@ -9,7 +9,7 @@ if LogStash::Environment.windows?
end
# Configure the test environment
source = File.expand_path(File.join(File.dirname(__FILE__), ".."))
source = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
integration_path = File.join(source, "integration_run")
puts "[integration_spec] configure environment"