From c1ca338fdb32b05fd047730be9ca6569d22c6806 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 14:08:34 +0000 Subject: Updated gems to (roughly) jessie versions; removed XMPP support. Also changed the postgres tests to "skip" if no postgres db is available. --- test/mauve_test_helper.rb | 2 +- test/tc_mauve_configuration_builders_person.rb | 3 --- test/tc_mauve_database_peculiarities.rb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/mauve_test_helper.rb b/test/mauve_test_helper.rb index 8653bd5..ca2db61 100644 --- a/test/mauve_test_helper.rb +++ b/test/mauve_test_helper.rb @@ -74,7 +74,7 @@ module MauveTestHelper # # [destination, alert, other_alerts] # - # e.g. destination will be an email address, phone number or xmpp ID, just + # e.g. destination will be an email address, or phone number, just # as in the configuration file. alert will be the subject of this # alert, and other_alerts will be the other notifications that # are relevant for this person at this time. diff --git a/test/tc_mauve_configuration_builders_person.rb b/test/tc_mauve_configuration_builders_person.rb index 76841a3..77bae3b 100644 --- a/test/tc_mauve_configuration_builders_person.rb +++ b/test/tc_mauve_configuration_builders_person.rb @@ -13,7 +13,6 @@ person("test1") { email "test1@example.com" sms "01234567890" - xmpp "test1@chat.example.com" password "topsekrit" @@ -35,7 +34,6 @@ EOF person = x.people["test1"] assert_equal("test1@example.com", person.email) assert_equal("01234567890", person.sms) - assert_equal("test1@chat.example.com", person.xmpp) assert_equal("topsekrit", person.password) # assert_equal(300, x.people["test1"].every) @@ -59,7 +57,6 @@ EOF assert_equal(nil, person.sms) assert_equal(nil, person.email) - assert_equal(nil, person.xmpp) assert_kind_of(Proc, person.low) assert_kind_of(Proc, person.normal) diff --git a/test/tc_mauve_database_peculiarities.rb b/test/tc_mauve_database_peculiarities.rb index ceef9ad..78459e2 100644 --- a/test/tc_mauve_database_peculiarities.rb +++ b/test/tc_mauve_database_peculiarities.rb @@ -69,7 +69,7 @@ class TcMauveDatabasePostgresPeculiarities < TcMauveDatabasePeculiarities unless $?.success? msg = "Skipping postgres tests, as DB creation (#{@temp_db}) failed." @temp_db = nil - flunk(msg) + skip(msg) end # @pg_conn = PGconn.open(:dbname => @temp_db) @db_url = "postgres:///#{@temp_db}" -- cgit v1.2.3 From 28e99f9de3f42a566011985c22e51c907ee27681 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:56:44 +0000 Subject: Moved most gems into debian deps; fixed test "skip" to "omit"; renamed test with duped name --- .gitlab-ci.yml | 6 ++-- Gemfile | 41 ++++++++++++----------- Gemfile.lock | 59 +-------------------------------- test/tc_mauve_authentication.rb | 2 +- test/tc_mauve_database_peculiarities.rb | 2 +- 5 files changed, 28 insertions(+), 82 deletions(-) (limited to 'test') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9774d4a..119759c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,9 +9,9 @@ test:jessie: &test variables: DISTRO: jessie before_script: - - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.4 libsqlite3-dev rake + - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.4 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit script: - - bundle install -j $(nproc) --path vendor/bundle --binstubs + - bundle install -j $(nproc) --path vendor/bundle --without development,test - bundle exec rake test test:stretch: @@ -19,7 +19,7 @@ test:stretch: variables: DISTRO: stretch before_script: - - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.6 libsqlite3-dev rake + - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.6 libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit package:jessie: &package image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb diff --git a/Gemfile b/Gemfile index 5af4b41..6343365 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,7 @@ source "https://rubygems.org" - gem "bcrypt-ruby", "= 3.1.5" -gem "log4r", "= 1.1.10" -gem "ipaddress", "= 0.8.0" gem "ruby_protobuf", "= 0.4.11" -gem "json", "= 1.8.1" gem "datamapper" gem "dm-aggregates" gem "dm-do-adapter" @@ -15,22 +11,29 @@ gem "dm-sqlite-adapter" gem "dm-transactions" gem "dm-types" gem "dm-validations" -gem "sanitize", "= 2.1.0" -gem "rmail", "= 1.1.0" -gem "thin", "= 1.6.3" -gem "haml", "= 4.0.5" -gem "haml-contrib" -gem "RedCloth", "= 4.2.9" -gem "rack", "= 1.5.2" -gem "rack-protection", "= 1.5.2" -gem "rack-flash3", "= 1.0.5" -gem "tilt", "= 1.4.1" -gem "sinatra", "~> 1.4.5" -gem "locale", "= 2.1.0" + +group :devlopment do + gem "log4r" + gem "ipaddress" + gem "ruby_protobuf" + gem "json" + gem "sanitize" + gem "rmail" + gem "thin" + gem "haml" + gem "haml-contrib" + gem "RedCloth" + gem "rack" + gem "rack-protection" + gem "rack-flash3" + gem "tilt" + gem "sinatra" + gem "locale" +end group :test do gem "simplecov", :require => false - gem "rack-test", "= 0.6.3" - gem "webmock", "= 1.19.0" - gem "timecop", "= 0.7.1" + gem "rack-test" + gem "webmock" + gem "timecop" end diff --git a/Gemfile.lock b/Gemfile.lock index 165fef9..3ec1459 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,11 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) bcrypt (3.1.11) bcrypt-ruby (3.1.5) bcrypt (>= 3.1.3) - crack (0.4.3) - safe_yaml (~> 1.0.0) - daemons (1.2.4) data_objects (0.10.17) addressable (~> 2.1) datamapper (1.2.0) @@ -64,60 +60,24 @@ GEM do_sqlite3 (0.10.17) data_objects (= 0.10.17) docile (1.1.5) - eventmachine (1.2.3) fastercsv (1.5.5) - haml (4.0.5) - tilt - haml-contrib (1.0.0.1) - haml (>= 3.2.0.alpha.13) - ipaddress (0.8.0) - json (1.8.1) + json (1.8.6) json_pure (1.8.6) - locale (2.1.0) - log4r (1.1.10) - mini_portile2 (2.1.0) multi_json (1.12.1) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.0) public_suffix (2.0.5) - rack (1.5.2) - rack-flash3 (1.0.5) - rack - rack-protection (1.5.2) - rack - rack-test (0.6.3) - rack (>= 1.0) - rmail (1.1.0) ruby_protobuf (0.4.11) - safe_yaml (1.0.4) - sanitize (2.1.0) - nokogiri (>= 1.4.4) simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) stringex (1.5.1) - thin (1.6.3) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) - rack (~> 1.0) - tilt (1.4.1) - timecop (0.7.1) uuidtools (2.1.5) - webmock (1.19.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) PLATFORMS ruby DEPENDENCIES - RedCloth (= 4.2.9) bcrypt-ruby (= 3.1.5) datamapper dm-aggregates @@ -128,22 +88,5 @@ DEPENDENCIES dm-transactions dm-types dm-validations - haml (= 4.0.5) - haml-contrib - ipaddress (= 0.8.0) - json (= 1.8.1) - locale (= 2.1.0) - log4r (= 1.1.10) - rack (= 1.5.2) - rack-flash3 (= 1.0.5) - rack-protection (= 1.5.2) - rack-test (= 0.6.3) - rmail (= 1.1.0) ruby_protobuf (= 0.4.11) - sanitize (= 2.1.0) simplecov - sinatra (~> 1.4.5) - thin (= 1.6.3) - tilt (= 1.4.1) - timecop (= 0.7.1) - webmock (= 1.19.0) diff --git a/test/tc_mauve_authentication.rb b/test/tc_mauve_authentication.rb index a770bc9..0f1a158 100644 --- a/test/tc_mauve_authentication.rb +++ b/test/tc_mauve_authentication.rb @@ -67,7 +67,7 @@ EOF end - def test_local_auth + def test_local_auth_again config=< @temp_db) @db_url = "postgres:///#{@temp_db}" -- cgit v1.2.3 From 9497809c98ba16d93d5291b6753e9cc3fb562684 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 22:20:39 +0000 Subject: Added postgres service + tests for jessie --- .gitlab-ci.yml | 12 ++++-- test/tc_mauve_database_peculiarities.rb | 69 ++++++++++++++++----------------- 2 files changed, 42 insertions(+), 39 deletions(-) (limited to 'test') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc9f55e..1215d24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,12 @@ stages: test:jessie: &test image: $CI_REGISTRY/docker-images/layers:$DISTRO-ruby stage: test + services: + - postgres:latest + variables: + POSTGRES_DB: mauve + POSTGRES_USER: mauveuser + POSTGRES_PASSWORD: "" variables: DISTRO: jessie before_script: @@ -13,9 +19,9 @@ test:jessie: &test script: - apt install libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit - bundle install -j $(nproc) --path vendor/bundle --without development - - bundle exec rake test + - POSTGRES_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB bundle exec rake test -test:stretch: +.test:stretch: <<: *test variables: DISTRO: stretch @@ -33,7 +39,7 @@ package:jessie: &package paths: - pkg/ -package:stretch: +.package:stretch: <<: *package variables: DISTRO: stretch diff --git a/test/tc_mauve_database_peculiarities.rb b/test/tc_mauve_database_peculiarities.rb index 9c20faa..8696ce7 100644 --- a/test/tc_mauve_database_peculiarities.rb +++ b/test/tc_mauve_database_peculiarities.rb @@ -1,5 +1,5 @@ # encoding: utf-8 -$:.unshift "../lib" +$LOAD_PATH.unshift '../lib' require 'th_mauve' require 'mauve/datamapper' @@ -14,7 +14,7 @@ class TcMauveDatabasePeculiarities < Mauve::UnitTest def setup super setup_database - @temp_db = "mauve_test.#{10.times.collect{ rand(36).to_s(36) }.join}" + @temp_db = "mauve_test.#{Array.new(10) { rand(36).to_s(36) }.join}" end def teardown @@ -28,7 +28,7 @@ class TcMauveDatabasePeculiarities < Mauve::UnitTest # return unless @db_url - config=< :replace, :undef => :replace, :replace => '?') - } + assert_nothing_raised("Failed to use iconv to convert to #{enc}") do + str = str.encode(enc, invalid: :replace, undef: :replace, replace: '?') + end alert = Alert.new( - :alert_id => "#{lang}:#{enc}", - :source => "test", - :subject => str + alert_id: "#{lang}:#{enc}", + source: 'test', + subject: str ) assert_nothing_raised("failed to insert #{enc}") { alert.save } @@ -60,30 +60,32 @@ EOF end end - - class TcMauveDatabasePostgresPeculiarities < TcMauveDatabasePeculiarities def setup super - system("createdb #{@temp_db} --encoding UTF8") - unless $?.success? - msg = "Skipping postgres tests, as DB creation (#{@temp_db}) failed." + + if ENV['POSTGRES_URL'] + @db_url = ENV['POSTGRES_URL'] @temp_db = nil - omit(msg) + else + system("createdb #{@temp_db} --encoding UTF8") + unless $?.success? + msg = "Skipping postgres tests, as DB creation (#{@temp_db}) failed." + @temp_db = nil + omit(msg) + end + # @pg_conn = PGconn.open(:dbname => @temp_db) + @db_url = "postgres:///#{@temp_db}" end - # @pg_conn = PGconn.open(:dbname => @temp_db) - @db_url = "postgres:///#{@temp_db}" end def teardown - # @pg_conn.finish if @pg_conn.is_a?(PGconn) and @pg_conn.status == PGconn::CONNECTION_OK super (system("dropdb #{@temp_db}") || puts("Failed to drop #{@temp_db}")) if @temp_db end - def test_reminders_only_go_once - config=< "test", - :source => "test", - :subject => "test" + a = Alert.new( + alert_id: 'test', + source: 'test', + subject: 'test' ) - assert(a.raise!, "raise was not successful") + assert(a.raise!, 'raise was not successful') assert(a.saved?) assert_equal(1, notification_buffer.length) notification_buffer.pop @@ -133,17 +135,14 @@ EOF assert_equal(1, notification_buffer.length) notification_buffer.pop end - end - - end class TcMauveDatabaseSqlite3Peculiarities < TcMauveDatabasePeculiarities def setup super # @pg_conn = PGconn.open(:dbname => @temp_db) - @db_url = "sqlite3::memory:" + @db_url = 'sqlite3::memory:' end # @@ -153,6 +152,4 @@ class TcMauveDatabaseSqlite3Peculiarities < TcMauveDatabasePeculiarities assert DataMapper::Adapters::SqliteAdapter.private_instance_methods.include?(:with_connection_old) assert DataMapper::Adapters::SqliteAdapter.public_instance_methods.include?(:synchronize) end - end - -- cgit v1.2.3