Skip to content

Fix Integration Tests #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robbavey wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Integration Tests #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/unit/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ services:
LS_JAVA_OPTS: "-Xmx256m -Xms256m"
LOGSTASH_SOURCE: 1
PG_CONNECTION_STRING: "jdbc:postgresql://postgresql:5432"
POSTGRES_PASSWORD: "test_user_password"
tty: true

postgresql:
image: postgres:latest
environment:
POSTGRES_PASSWORD: "test_user_password"
volumes:
- ./setup.sql:/docker-entrypoint-initdb.d/init.sql
ports:
Expand Down
2 changes: 1 addition & 1 deletion logstash-filter-jdbc_streaming.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'sequel'
s.add_runtime_dependency 'lru_redux' # lru cache with ttl

s.add_development_dependency 'logstash-devutils'
s.add_development_dependency 'logstash-devutils', '~> 1.3'
s.add_development_dependency 'jdbc-derby'
end
1 change: 1 addition & 0 deletions spec/filters/jdbc_streaming_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "logstash/devutils/rspec/spec_helper"
require "logstash/devutils/rspec/shared_examples"
require "logstash/filters/jdbc_streaming"
require 'jdbc/derby'
require "sequel"
Expand Down
6 changes: 5 additions & 1 deletion spec/integration/jdbcstreaming_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "logstash/devutils/rspec/spec_helper"
require "logstash/devutils/rspec/shared_examples"
require "logstash/filters/jdbc_streaming"
require "sequel"
require "sequel/adapters/jdbc"
Expand All @@ -16,7 +17,10 @@ class TestJdbcStreaming < JdbcStreaming
"jdbc:postgresql://postgresql:5432") + "/jdbc_streaming_db?user=postgres"

let(:mixin_settings) do
{ "jdbc_driver_class" => "org.postgresql.Driver",
{
"jdbc_user" => ENV['USER'],
"jdbc_password" => ENV["POSTGRES_PASSWORD"],
"jdbc_driver_class" => "org.postgresql.Driver",
"jdbc_driver_library" => "/usr/share/logstash/postgresql.jar",
"jdbc_connection_string" => jdbc_connection_string
}
Expand Down