merge

7 files changed, 219 insertions, 446 deletions

diff --git a/test/alert_and_notification_logic.rb b/test/alert_and_notification_logic.rb
deleted file mode 100644
index 19b2478..0000000
--- a/test/alert_and_notification_logic.rb
+++ /dev/null
@@ -1,391 +0,0 @@
-# Mauve server tests - alerts and notification logic.  Define the basic workings
-# so that we know what should happen when we send sequences of alerts at
-# different times.
-#
-# These aren't really unit tests, just narrative specifications as to what
-# should happen under what stimuli.  I suspect I will break these down into
-# smaller units if things break under otherwise difficult conditions.
-#
-
-$: << __FILE__.split("/")[0..-2].join("/")
-require 'test/unit'
-require 'mauve_test_helper'
-require 'mauve_time'
-
-class AlertAndNotificationLogic < Test::Unit::TestCase
-  include MauveTestHelper
-    
-  def configuration_template
-    <<-TEMPLATE
-    # This is the head of all the configuration files.  Filenames are relative
-    # to the cwd, which is assumed to be a fleeting test directory.
-
-    server {
-      ip "127.0.0.1"
-      port #{@port_alerts ||= 44444}
-      log_file ENV['TEST_LOG'] ? STDOUT : "#{dir}/log"
-      log_level 0
-      database "sqlite3:///#{dir}/mauve_test.db"
-      transmission_id_expire_time 600
-
-      # doesn't restart nicely at the moment      
-      #web_interface {
-      #  port #{@port_web ||= 44444}
-      #}
-    }
-
-    #
-    # All notifications are sent to files which we can open up and check during
-    # our tests.  Network delivery is not tested in this script.
-    #
-
-    notification_method("xmpp") {
-      deliver_to_queue AlertAndNotificationLogic::Notifications
-      deliver_to_file "#{dir}/xmpp.txt"
-      disable_normal_delivery!
-
-      jid "mauveserv@chat.bytemark.co.uk"
-      password "foo"
-    }
-
-    notification_method("email") {
-      deliver_to_queue AlertAndNotificationLogic::Notifications
-      deliver_to_file "#{dir}/email.txt"
-      disable_normal_delivery!
-      
-      # add in SMTP server, username, password etc.
-      # default to sending through localhost
-      from "matthew@bytemark.co.uk"
-      server "bytemail.bytemark.co.uk"
-      subject_prefix "[Bytemark alerts] "
-      
-    }
-
-    notification_method("sms") {
-      provider "AQL"
-      deliver_to_queue AlertAndNotificationLogic::Notifications
-      deliver_to_file "#{dir}/sms.txt"
-      disable_normal_delivery!
-      
-      username "x"
-      password "x"
-      from "01904890890"
-      max_messages_per_alert 3
-    }
-
-    # a person common to all our tests
-
-    person("joe_bloggs") {
-      urgent { sms("12345") }
-      normal { email("12345@joe_bloggs.email") }
-      low { xmpp("12345@joe_bloggs.xmpp") }
-    }
-    
-    person("jimmy_junior") {
-      urgent { sms("66666") }
-      normal { email("jimmy@junior.email") }
-      low { email("jimmy@junior.email") }
-    }
-
-    alert_group {
-      includes { source == "rare-and-important" }
-      acknowledgement_time 60.minutes
-      level URGENT
-      
-      notify("joe_bloggs") { every 10.minutes }
-    }
-    
-    alert_group {
-      includes { source == "noisy-and-annoying" || alert_id == "whine" }
-      acknowledgement_time 24.hours
-      level LOW
-      
-      notify("jimmy_junior") { every 2.hours }
-      notify("joe_bloggs") { 
-        every 30.minutes 
-        during {
-          unacknowledged 6.hours
-        }
-      }
-    }
-    
-    alert_group {
-      includes { source == "can-wait-until-monday" }
-      level NORMAL
-      
-      notify("jimmy_junior") {
-        every 30.minutes
-        during { days_in_week(1..5) && hours_in_day(9..5) }
-      }
-      notify("joe_bloggs") {
-        every 2.hours
-        during { days_in_week(1..5) && hours_in_day(9..5) }
-      }
-    }
-
-    # catch-all
-    alert_group {
-      acknowledgement_time 1.minute
-      level NORMAL
-      
-      notify("joe_bloggs") { every 1.hour }
-    }
-    TEMPLATE
-  end
-  
-  def setup
-    start_server(configuration_template)
-  end
-  
-  def teardown
-    stop_server
-    # no tests should leave notifications on the stack
-    assert_no_notification
-  end
-  
-  # Raise one alert, check representation in database, and that alert is 
-  # received as expected.
-  #
-  def test_basic_fields_are_recognised
-    mauvesend("-o my_source -i alert1 -s \"alert1 summary\" -d \"alert1 detail\" -u \"alert1 subject\"")
-
-    assert_not_nil(alert = Alert.first)
-    assert_equal("my_source", alert.source)
-    assert_equal("alert1", alert.alert_id)
-    assert_equal("alert1 summary", alert.summary)
-    assert_equal("alert1 detail", alert.detail)
-    assert_equal("alert1 subject", alert.subject)
-    assert(alert.raised?)
-    assert(!alert.cleared?)
-    assert(!alert.acknowledged?)
-    
-    with_next_notification do |destination, this_alert, other_alerts|    
-      assert_equal("12345@joe_bloggs.email", destination)
-      assert_equal(Alert.first, this_alert)
-      assert_equal([Alert.first], other_alerts)
-    end
-    
-  end
-  
-  # Check that a simple automatic raise, acknowledge & auto-clear request 
-  # work properly.
-  #
-  def test_auto_raise_and_clear
-    # Raise the alert, wait for it to be processed
-    mauvesend("-o my_source -i alert1 -s \"alert1 summary\" -d \"alert1 detail\" -u \"alert1 subject\" -r +5m -c +10m")
-    
-    # Check internal state
-    #
-    assert(!Alert.first.raised?, "Auto-raising alert raised early")
-    assert(!Alert.first.cleared?, "Auto-clearing alert cleared early")
-    assert(!Alert.first.acknowledged?, "Alert acknowledged when I didn't expect it")
-    
-    # We asked for it to be raised in 5 minutes, so no alert yet...
-    #
-    assert_no_notification
-
-    # Push forward to when the alert should be raised, check it has been
-    #
-    Time.advance(5.minutes)    
-    assert(Alert.first.raised?, "#{Alert.first.inspect} should be raised by now")
-    assert(!Alert.first.cleared?, "#{Alert.first.inspect} should not be cleared")
-    
-    # Check that we have a notification
-    #
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal("12345@joe_bloggs.email", destination)
-      assert_equal(Alert.first, this_alert)
-      assert_equal('raised', this_alert.update_type)
-    end
-    
-    # Simulate manual acknowledgement
-    #
-    Alert.first.acknowledge!(Configuration.current.people["joe_bloggs"])
-    Timers.restart_and_then_wait_until_idle    
-    assert(Alert.first.acknowledged?, "Acknowledgement didn't work")
-
-    # Check that the acknowledgement has caused a notification
-    #
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal("12345@joe_bloggs.email", destination)
-      assert_equal(Alert.first, this_alert)
-      assert_equal('acknowledged', this_alert.update_type, this_alert.inspect)
-    end
-    assert(Alert.first.acknowledged?)
-    assert(Alert.first.raised?)
-    assert(!Alert.first.cleared?)
-    
-    # Now with the config set to un-acknowledge alerts after only 1 minute,
-    # try winding time on and check that this happens.
-    #
-    Time.advance(2.minutes)
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal("12345@joe_bloggs.email", destination)
-      assert_equal(Alert.first, this_alert)
-      assert_equal('raised', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # Check that auto-clearing works four minutes later
-    #
-    Time.advance(5.minutes)
-    assert(Alert.first.cleared?)
-    assert(!Alert.first.raised?)
-
-    # Finally check for a notification that auto-clearing has happened
-    #
-    with_next_notification do |destination, this_alert, other_alerts| 
-      assert_equal("12345@joe_bloggs.email", destination)
-      assert_equal(Alert.first, this_alert)
-      assert_equal('cleared', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # And see that no further reminders are sent a while later
-    Time.advance(1.day)
-    assert_no_notification
-  end
-  
-  def test_one_alert_changes_from_outside
-    # Raise our test alert, wait for it to be processed
-    mauvesend("-o my_source -i alert1 -s \"alert1 summary\" -d \"alert1 detail\" -u \"alert1 subject\"")
-    
-    # Check internal representation, external notification
-    # 
-    assert(Alert.first.raised?)
-    assert(!Alert.first.cleared?)
-    with_next_notification do |destination, this_alert, other_alerts|      
-      assert_equal('raised', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # Check we get reminders every hour, and no more
-    #
-    12.times do
-      Time.advance(1.hour)
-      with_next_notification do |destination, this_alert, other_alerts|      
-        assert_equal('raised', this_alert.update_type, this_alert.inspect)
-      end
-      assert_no_notification 
-    end
-    
-    # Clear the alert, wait for it to be processed
-    mauvesend("-o my_source -i alert1 -c now")
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    with_next_notification do |destination, this_alert, other_alerts|      
-      assert_equal('cleared', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # Check we can raise the same alert again
-    Time.advance(1.minute)
-    mauvesend("-o my_source -i alert1 -s \"alert1 summary\" -d \"alert1 detail\" -u \"alert1 subject\" -r now")
-    assert(Alert.first.raised?, Alert.first.inspect)
-    assert(!Alert.first.cleared?, Alert.first.inspect)
-    with_next_notification do |destination, this_alert, other_alerts|      
-      assert_equal('raised', this_alert.update_type, this_alert.inspect)
-    end
-  end
-  
-  def test_alert_groups
-    # check that this alert is reminded more often than normal
-    mauvesend("-o rare-and-important -i alert1 -s \"rare and important alert\"")
-    assert(Alert.first.raised?)
-    assert(!Alert.first.cleared?)
-    
-    10.times do
-      with_next_notification do |destination, this_alert, other_alerts|
-        assert_equal('raised', this_alert.update_type, this_alert.inspect)
-        assert_equal('12345', destination)
-        Time.advance(10.minutes)
-      end
-    end
-    discard_next_notification
-  end
-  
-  def test_future_raising
-    mauvesend("-i heartbeat -c now -r +10m -s \"raise in the future\"")
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    assert_no_notification
-    
-    # Check the future alert goes off
-    #
-    Time.advance(10.minutes)
-    assert(Alert.first.raised?)
-    assert(!Alert.first.cleared?)
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal('raised', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # Check that a repeat of the "heartbeat" update clears it, and we get
-    # a notification.
-    #
-    mauvesend("-i heartbeat -c now -r +10m -s \"raise in the future\"")
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal('cleared', this_alert.update_type, this_alert.inspect)
-    end
-    
-    # Check that a re-send of the same clear alert doesn't send another 
-    # notification
-    #
-    Time.advance(1.minute)
-    mauvesend("-i heartbeat -c now -r +10m -s \"raise in the future\"")
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    assert_no_notification
-    
-    # Check that a skewed resend doesn't confuse it
-    #
-    mauvesend("-i heartbeat -c +1m -r +11m -s \"raise in the future\"")
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    Time.advance(1.minute)
-    assert(!Alert.first.raised?)
-    assert(Alert.first.cleared?)
-    assert_no_notification
-  end
-  
-  # Make sure that using the "replace all flag" works as expected.
-  #
-  def test_replace_flag
-    mauvesend("-p")
-    #mauvesend("-p")
-    assert_no_notification
-    
-    mauvesend("-i test1 -s\"\test1\"")
-    assert(Alert.first.raised?)
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal('raised', this_alert.update_type, this_alert.inspect)
-    end
-    assert_no_notification
-    
-    mauvesend("-p")
-    #mauvesend("-p")
-    with_next_notification do |destination, this_alert, other_alerts|
-      assert_equal('cleared', this_alert.update_type, this_alert.inspect)
-    end
-    assert_no_notification
-  end
-  
-  def test_earliest_date
-    alert = Alert.create!(
-      :alert_id => "test_id",
-      :source => "test1",
-      :subject => "test subject",
-      :summary => "test summary",
-      :raised_at => nil,
-      :will_raise_at => Time.now + 60,
-      :will_clear_at => Time.now + 120,
-      :update_type => "cleared",
-      :updated_at => Time.now
-    )
-    assert(alert)
-    
-    assert(AlertEarliestDate.first.alert == alert)
-  end
-  
-end
-
-
-
-
diff --git a/test/tc_mauve_alert_changed.rb b/test/tc_mauve_alert_changed.rb
index 167ea75..6cd51fb 100644
--- a/test/tc_mauve_alert_changed.rb
+++ b/test/tc_mauve_alert_changed.rb
@@ -24,6 +24,10 @@ class TcMauveAlertChanged < Mauve::UnitTest
   def test_reminder
 
     config=<<EOF
+server {
+  use_notification_buffer  false
+}
+
 notification_method("email") {
   debug!
   deliver_to_queue []
@@ -63,8 +67,6 @@ EOF
       # In order to send the notification and stick in the reminder, we need to
       # process the buffer.
       #
-      assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
-
       assert_equal(notifications, notification_buffer.length)
       assert_equal(reminders, AlertChanged.count)
 
@@ -82,12 +84,7 @@ EOF
     alert.clear!
     notifications += 1
 
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(notifications, notification_buffer.length)
-    #
-    # Process the buffer again
-    #
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(reminders,     AlertChanged.count)
 
     Timecop.freeze(Time.now + 10.minutes)
@@ -95,7 +92,6 @@ EOF
     #
     # Send NO MORE notifications.
     #
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(notifications, notification_buffer.length)
     assert_equal(reminders,   AlertChanged.count)
 
@@ -103,6 +99,10 @@ EOF
 
   def test_only_send_one_alert_on_unacknowledge
     config=<<EOF
+server {
+  use_notification_buffer  false
+}
+
 notification_method("email") {
   debug!
   deliver_to_queue []
@@ -131,12 +131,10 @@ EOF
     alert = Alert.new(:source => "test", :alert_id => "test_alert", :summary => "test alert")
     alert.raise!
 
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(1, notification_buffer.length, "Wrong no of notifications sent after raise.")
     assert_equal(1, AlertChanged.count, "Wrong no of AlertChangeds created after raise.")
 
     alert.acknowledge!(Configuration.current.people["test_person"], Time.now + 10.minutes)
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(2, notification_buffer.length, "Wrong no of notifications sent after raise.")
     assert_equal(2, AlertChanged.count, "Wrong no of AlertChangeds created after acknowledge.")
 
@@ -145,7 +143,6 @@ EOF
     #
     Timecop.freeze(Time.now + 10.minutes)
     AlertChanged.all.each{|ac| ac.poll}
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(2, notification_buffer.length, "Extra notifications sent when alertchangeds are polled.")
   
     #
@@ -154,19 +151,21 @@ EOF
     alert.poll
     assert(!alert.acknowledged?,"Alert not unacknowledged")
     assert(alert.raised?,"Alert not raised following unacknowledgment")
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(3, notification_buffer.length, "No re-raise notification sent.")
 
     #
     # If we poll the AlertChangeds again, no further notification should be sent.
     #
     AlertChanged.all.each{|ac| ac.poll}
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(3, notification_buffer.length, "Extra notifications sent when alertchangeds are polled.")
   end
 
   def test_only_set_one_alert_changed_on_a_reminder_after_multiple_raises_and_clears
     config=<<EOF
+server {
+  use_notification_buffer  false
+}
+
 notification_method("email") {
   debug!
   deliver_to_queue []
@@ -211,7 +210,6 @@ EOF
     #
     # No notification should have been sent, since it is the middle of the night
     #
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(0, notification_buffer.length, "No notifications should have been sent.")
     assert(alert.cleared?)
 
@@ -222,7 +220,6 @@ EOF
     #
     # Still no alerts should be sent.
     #
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(0, notification_buffer.length, "No notifications should have been sent.")
     assert(alert.raised?)
 
diff --git a/test/tc_mauve_authentication.rb b/test/tc_mauve_authentication.rb
new file mode 100644
index 0000000..d0f2d4f
--- /dev/null
+++ b/test/tc_mauve_authentication.rb
@@ -0,0 +1,168 @@
+$:.unshift "../lib"
+
+
+require 'th_mauve'
+require 'th_mauve_resolv'
+
+require 'mauve/server'
+require 'mauve/authentication'
+require 'mauve/configuration'
+require 'mauve/configuration_builder'
+require 'mauve/configuration_builders'
+
+class TcMauveAuthentication < Mauve::UnitTest 
+  include Mauve
+
+
+  def setup
+    super
+    setup_database
+  end
+
+  def teardown
+    teardown_database
+    super
+  end
+
+  def test_default_auth_always_fails
+    config=<<EOF
+server {
+  failed_login_delay 0
+}
+EOF
+
+    Configuration.current = ConfigurationBuilder.parse(config)
+    Server.instance.setup
+    assert_equal(false, Authentication.authenticate("test","password"))
+    #
+    # No warning
+    #
+    assert_nil(logger_shift)
+
+  end
+
+  def test_local_auth
+    config=<<EOF
+server {
+  failed_login_delay 0
+}
+
+person ("test") {
+  password "#{Digest::SHA1.new.hexdigest("password")}"
+  all { true }
+}
+EOF
+
+    Configuration.current = ConfigurationBuilder.parse(config)
+    Server.instance.setup
+    assert(!Authentication.authenticate("test","badpassword"))
+    #
+    # Should warn that a bad password has been used.
+    #
+    assert_match(/AuthLocal for test failed/, logger_shift)
+    assert(Authentication.authenticate("test","password"))
+    #
+    # No warnings
+    #
+    assert_nil(logger_shift)
+  end
+
+
+  def test_local_auth
+    config=<<EOF
+server {
+  failed_login_delay 0
+}
+
+person ("nopass") { }
+
+person ("test") {
+  password "#{Digest::SHA1.new.hexdigest("password")}"
+}
+EOF
+
+    Configuration.current = ConfigurationBuilder.parse(config)
+    Server.instance.setup
+    assert(!Authentication.authenticate("nopass","badpassword"))
+    logger_shift
+    assert(!Authentication.authenticate("test","badpassword"))
+    logger_shift
+    assert(Authentication.authenticate("test","password"))
+  end
+
+  def test_bytemark_auth
+    # 
+    # BytemarkAuth test users are:
+    #   test1: ummVRu7qF
+    #   test2: POKvBqLT7
+    #
+    config=<<EOF
+server {
+  failed_login_delay 0
+  bytemark_auth_url "https://auth.bytemark.co.uk/"
+}
+
+person ("test1") { }
+
+person ("test2") {
+  password "#{Digest::SHA1.new.hexdigest("password")}"
+}
+
+person ("test3") {
+  password "#{Digest::SHA1.new.hexdigest("password")}"
+}
+EOF
+
+    Configuration.current = ConfigurationBuilder.parse(config)
+    Server.instance.setup
+
+    #
+    # Test to make sure auth can fail
+    #
+    assert(!Authentication.authenticate("test1","password"))
+    # 
+    # Should issue a warning for just bytemark auth failing, and no more.
+    #
+    assert_match(/AuthBytemark for test1 failed/, logger_shift)
+    assert_nil(logger_shift)
+
+    assert(Authentication.authenticate("test1","ummVRu7qF"))
+    # 
+    # Shouldn't issue any warnings.
+    #
+    assert_nil(logger_shift)
+  
+    #
+    # Test to make sure that in the event of failure we fall back to local
+    # auth, which should also fail in this case.
+    #
+    assert(!Authentication.authenticate("test2","badpassword"))
+    assert_match(/AuthBytemark for test2 failed/, logger_shift)
+    assert_match(/AuthLocal for test2 failed/, logger_shift)
+
+    #
+    # Test to make sure that in the event of failure we fall back to local
+    # auth, which should pass in this case.
+    #
+    assert(Authentication.authenticate("test2","password"))
+    # 
+    # Should issue a warning for just bytemark auth failing, and no more.
+    #
+    assert_match(/AuthBytemark for test2 failed/, logger_shift)
+    assert_nil(logger_shift)
+
+    #
+    # Finally test to make sure local-only still works
+    #
+    assert(Authentication.authenticate("test3","password"))
+    # 
+    # Should issue a warning for just bytemark auth failing, and no more.
+    #
+    assert_match(/AuthBytemark for test3 failed/, logger_shift)
+    assert_nil(logger_shift)
+
+  end
+
+
+
+end
diff --git a/test/tc_mauve_notification.rb b/test/tc_mauve_notification.rb
index bac389f..7ff0d79 100644
--- a/test/tc_mauve_notification.rb
+++ b/test/tc_mauve_notification.rb
@@ -185,6 +185,10 @@ class TcMauveNotification < Mauve::UnitTest
     t = Time.now
 
     config=<<EOF
+server {
+  use_notification_buffer false
+}
+
 notification_method("email") {
   debug!
   deliver_to_queue []
@@ -251,7 +255,6 @@ EOF
     #
     # Also make sure that only 2 notifications has been sent..
     #
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
     assert_equal(2, notification_buffer.size, "Wrong number of notifications sent")
 
     #
@@ -277,14 +280,25 @@ EOF
   # Makes sure a reminder is set at the start of the notify clause.
   #  
   def test_reminder_is_set_at_start_of_during
-
     config=<<EOF
+server {
+  use_notification_buffer false
+}
+
+notification_method("email") {
+  debug!
+  deliver_to_queue []
+  disable_normal_delivery!
+}
+
 person ("test1") {
-  all { true }
+  email "test1@example.com"
+  all { email }
 }
 
 person ("test2") {
-  all { true }
+  email "test2@example.com"
+  all { email }
 }
 
 alert_group("default") {
@@ -315,7 +329,6 @@ EOF
     )
     alert.raise!
 
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
 
     assert_equal(1, Alert.count, "Wrong number of alerts saved")
     assert_equal(1, AlertChanged.count, "Wrong number of reminders inserted")
@@ -324,7 +337,6 @@ EOF
     assert_equal("urgent", a.level, "Level is wrong for #{a.person}")
     assert_equal("raised", a.update_type, "Update type is wrong for #{a.person}")
     assert_equal(Time.now + 5.minutes, a.remind_at,"reminder time is wrong for #{a.person}")
-
   end
 
 
@@ -335,6 +347,10 @@ EOF
   def test_no_race_conditions_in_during
 
     config=<<EOF
+server {
+  use_notification_buffer false
+}
+
 notification_method("email") {
   debug!
   deliver_to_queue []
@@ -383,8 +399,6 @@ EOF
     Timecop.travel(Time.now + 7.hours + 59.minutes + 59.seconds)
     alert.raise!
 
-    assert_nothing_raised{ Notifier.instance.__send__(:main_loop) }
-
     assert_equal(1, notification_buffer.size, "Wrong number of notifications sent")
   end
 
diff --git a/test/tc_mauve_web_interface.rb b/test/tc_mauve_web_interface.rb
index a120c37..54c9697 100644
--- a/test/tc_mauve_web_interface.rb
+++ b/test/tc_mauve_web_interface.rb
@@ -53,12 +53,6 @@ class WebInterfaceTest < Mauve::UnitTest
     super
     setup_database
 
-    # 
-    # BytemarkAuth test users are:
-    #
-    #   test1: ummVRu7qF
-    #   test2: POKvBqLT7
-    #
     config =<<EOF
 server {
   hostname "localhost"
@@ -70,13 +64,8 @@ server {
   }
 }
 
-person ("test0") {
-  password "#{Digest::SHA1.new.hexdigest("password")}"
-  all { true }
-}
-
 person ("test1") {
-  password "#{Digest::SHA1.new.hexdigest("ummVRu7qF")}"
+  password "#{Digest::SHA1.new.hexdigest("goodpassword")}"
   all { true }
 }
 
@@ -150,9 +139,16 @@ EOF
     assert(last_response.body.include?("Mauve: Login"))
     assert(session['__FLASH__'].has_key?(:error),"The flash error wasn't set")
 
-    post '/login', :username => 'test1', :password => 'ummVRu7qF'
+    #
+    # This last login attempt produces two warning messages (one for each auth
+    # type), so pop them both off the logger.
+    #
+    logger_pop ; logger_pop
+
+    post '/login', :username => 'test1', :password => 'goodpassword'
     follow_redirect!  while last_response.redirect?
     assert last_response.body.include?('Mauve: ')
+    assert last_response.ok?
 
     get '/logout'
     follow_redirect!  while last_response.redirect?
@@ -160,7 +156,7 @@ EOF
   end
 
   def test_alerts_show_subject
-    post '/login', :username => 'test1', :password => 'ummVRu7qF'
+    post '/login', :username => 'test1', :password => 'goodpassword'
     follow_redirect!  while last_response.redirect?
     assert last_response.body.include?('Mauve: ')
 
diff --git a/test/test_mauve.rb b/test/test_mauve.rb
index ce83c6c..a0531d7 100644
--- a/test/test_mauve.rb
+++ b/test/test_mauve.rb
@@ -8,24 +8,9 @@ require 'pp'
 require 'test/unit'
 require 'th_mauve'
 
-%w(
-tc_mauve_alert_changed.rb
-tc_mauve_alert_group.rb
-tc_mauve_alert.rb
-tc_mauve_configuration_builder.rb
-tc_mauve_configuration_builders_alert_group.rb
-tc_mauve_configuration_builders_logger.rb
-tc_mauve_configuration_builders_notification_method.rb
-tc_mauve_configuration_builders_person.rb
-tc_mauve_configuration_builders_server.rb
-tc_mauve_history.rb
-tc_mauve_notification.rb
-tc_mauve_people_list.rb
-tc_mauve_person.rb
-tc_mauve_source_list.rb
-tc_mauve_time.rb
-tc_mauve_web_interface.rb
-).each do |s|
+%w(. test).each do |dir|
+Dir.glob(File.join(dir,"tc_*.rb")).each do |s|
   require s
 end
+end
 
diff --git a/test/th_mauve.rb b/test/th_mauve.rb
index 2b97e64..ce29e11 100644
--- a/test/th_mauve.rb
+++ b/test/th_mauve.rb
@@ -77,6 +77,10 @@ module Mauve
     def logger_pop
       @outputter.pop
     end
+
+    def logger_shift
+      @outputter.shift
+    end
     
     def teardown_logger
       logger = Log4r::Logger['Mauve']