Fix warnings with newer minitest versions.
[mailshears.git] / test / test_mv.rb
index f91c4bf79c8583e36ed570fcebad6005f45971cf..968782b5548e92c110c1d6063cf9cb64ea3a79a9 100644 (file)
@@ -3,7 +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'
@@ -66,14 +65,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
@@ -138,14 +140,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