X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_rm.rb;fp=test%2Ftest_rm.rb;h=002fedaefe9a7247b23049c930fbaebaa009a72c;hp=02de53d08f5a3b95f18875196f05ef73d7049d10;hb=d078dd8216e0cd101a945dfac448bde9f7d73d1a;hpb=7a372ba193246c043d64553b806b48086d128cbb diff --git a/test/test_rm.rb b/test/test_rm.rb index 02de53d..002feda 100644 --- a/test/test_rm.rb +++ b/test/test_rm.rb @@ -3,7 +3,6 @@ require 'common/domain' require 'common/user' require 'mailshears_test' -require 'rm/plugins/agendav' require 'rm/plugins/davical' require 'rm/plugins/dovecot' require 'rm/plugins/postfixadmin' @@ -26,7 +25,6 @@ class TestRm < MailshearsTest actual = output_buffer.string() expected = - "AgendavRm - Removed user adam@example.net.\n" + "DavicalRm - User adam@example.net not found.\n" + "DovecotRm - Removed user adam@example.net " + "(#{cfg.dovecot_mail_root}/example.net/adam).\n" + @@ -37,18 +35,6 @@ class TestRm < MailshearsTest # Now make sure the database has what we expect. - arm = AgendavRm.new(cfg) - actual = arm.list_users() - expected = [User.new('booger@example.com')] - assert_equal(expected, actual) - - # Only try to remove this guy from the agendav database, to ensure - # that "nonexistent" users have their shares removed. - arm.remove_user('stinky@example.com') - expected = 2 - actual = arm.count_shares() - assert_equal(expected, actual) - drm = DavicalRm.new(cfg) actual = drm.list_users() expected = [User.new('alice@example.com'), User.new('booger@example.com')] @@ -106,7 +92,6 @@ class TestRm < MailshearsTest actual = output_buffer.string() expected = - "AgendavRm - Removed domain example.net.\n" + "DavicalRm - Domain example.net not found.\n" + "DovecotRm - Removed domain example.net " + "(#{cfg.dovecot_mail_root}/example.net).\n" + @@ -117,11 +102,6 @@ class TestRm < MailshearsTest # Now make sure the database has what we expect. - arm = AgendavRm.new(cfg) - actual = arm.list_users() - expected = [User.new('booger@example.com')] - assert_equal(expected, actual) - drm = DavicalRm.new(cfg) actual = drm.list_users() expected = [User.new('alice@example.com'), User.new('booger@example.com')]