diff options
| author | Patrick J Cherry <patrick@bytemark.co.uk> | 2017-03-20 14:08:34 +0000 |
|---|---|---|
| committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2017-03-20 14:11:27 +0000 |
| commit | c1ca338fdb32b05fd047730be9ca6569d22c6806 (patch) | |
| tree | 23eb2052dd9aaf7569d5c030a9b3676b69de947f /test | |
| parent | cce9b3743fa1128ffb72b7d2c5f5aa94a52993e9 (diff) | |
Updated gems to (roughly) jessie versions; removed XMPP support.
Also changed the postgres tests to "skip" if no postgres db is
available.
Diffstat (limited to 'test')
| -rw-r--r-- | test/mauve_test_helper.rb | 2 | ||||
| -rw-r--r-- | test/tc_mauve_configuration_builders_person.rb | 3 | ||||
| -rw-r--r-- | test/tc_mauve_database_peculiarities.rb | 2 |
3 files changed, 2 insertions, 5 deletions
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}" |