X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_mv.rb;h=a409304b27ae44ae7f8ef07339d12feb517938d8;hp=f91c4bf79c8583e36ed570fcebad6005f45971cf;hb=HEAD;hpb=3de4ec0727320a41d1be4f37973ffc81abc91d36

diff --git a/test/test_mv.rb b/test/test_mv.rb
index f91c4bf..f007cdc 100644
--- a/test/test_mv.rb
+++ b/test/test_mv.rb
@@ -3,8 +3,6 @@
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'
-require 'minitest/autorun'
-require 'mv/plugins/agendav'
 require 'mv/plugins/davical'
 require 'mv/plugins/dovecot'
 require 'mv/plugins/postfixadmin'
@@ -28,7 +26,6 @@ class TestMv < MailshearsTest
     actual = output_buffer.string()
 
     expected =
-      "AgendavMv - Source user alice@example.com not found.\n" +
       "DavicalMv - Moved user alice@example.com (Principal ID: 1) " +
         "to alice@example.net (Principal ID: 1).\n" +
       "DovecotMv - Moved user alice@example.com " +
@@ -42,11 +39,6 @@ class TestMv < MailshearsTest
 
     # Now check the database.
 
-    amv = AgendavMv.new(cfg)
-    actual = amv.list_users()
-    expected = [User.new('adam@example.net'),User.new('booger@example.com')]
-    assert_equal(expected.sort(), actual.sort())
-
     dmv = DavicalMv.new(cfg)
     actual = dmv.list_users()
     expected = [User.new('alice@example.net'), User.new('booger@example.com')]
@@ -66,14 +58,17 @@ class TestMv < MailshearsTest
     assert_equal(expected.sort(), actual.sort())
 
     actual = pfamv.list_aliases()
-    expected = [{'address' => 'alice@example.net',
-                 'goto' => 'alice@example.net'},
-                {'address' => 'bob@example.com',
-                 'goto' => 'bob@example.com'},
-                {'address' => 'adam@example.net',
+    expected = [{'address' => 'adam@example.net',
                  'goto' => 'adam@example.net'},
+                {'address' => 'alice@example.net',
+                 'goto' => 'alice@example.net,' +
+                           'adam@example.net,' +
+                           'bob@example.com,' +
+                           'carol@example.net'},
                 {'address' => 'beth@example.net',
-                    'goto' => 'beth@example.net'},
+                 'goto' => 'beth@example.net'},
+                {'address' => 'bob@example.com',
+                 'goto' => 'bob@example.com'},
                 {'address' => 'carol@example.net',
                  'goto' => 'carol@example.net'}]
     expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
@@ -114,11 +109,6 @@ class TestMv < MailshearsTest
     # Skip output verification, it's ugly. But make sure the database
     # has what we expect.
 
-    amv = AgendavMv.new(cfg)
-    actual = amv.list_users()
-    expected = [User.new('adam@example.net'),User.new('booger@example.com')]
-    assert_equal(expected.sort(), actual.sort())
-
     dmv = DavicalMv.new(cfg)
     actual = dmv.list_users()
     expected = [User.new('alice@example.com'), User.new('booger@example.com')]
@@ -138,14 +128,17 @@ class TestMv < MailshearsTest
     assert_equal(expected.sort(), actual.sort())
 
     actual = pfamv.list_aliases()
-    expected = [{'address' => 'alice@example.com',
-                 'goto' => 'alice@example.com'},
-                {'address' => 'bob@example.com',
-                 'goto' => 'bob@example.com'},
-                {'address' => 'adam@example.net',
+    expected = [{'address' => 'adam@example.net',
                  'goto' => 'adam@example.net'},
+                {'address' => 'alice@example.com',
+                 'goto' => 'alice@example.com,' +
+                           'adam@example.net,' +
+                           'bob@example.com,' +
+                           'carol@example.net'},
                 {'address' => 'beth@example.net',
-                    'goto' => 'beth@example.net'},
+                 'goto' => 'beth@example.net'},
+                {'address' => 'bob@example.com',
+                 'goto' => 'bob@example.com'},
                 {'address' => 'carol@example.net',
                  'goto' => 'carol@example.net'}]
     expected.each { |e| assert(actual.include?(e)) } # can't sort dicts