From 3b8f0a3c4981f61d2f9b759b27a1e4b3c1d504aa Mon Sep 17 00:00:00 2001
From: baizg1107 <preloyalwhite@163.com>
Date: Mon, 20 Jun 2022 11:33:30 +0800
Subject: [PATCH] fix tests assertion error

---
 src/mailman/commands/tests/test_cli_addmembers.py  |  1 +
 src/mailman/commands/tests/test_cli_delmembers.py  |  1 +
 src/mailman/commands/tests/test_cli_notify.py      |  7 +++----
 src/mailman/commands/tests/test_cli_syncmembers.py | 12 ++++++------
 src/mailman/model/tests/test_listmanager.py        | 12 ++++++------
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/mailman/commands/tests/test_cli_addmembers.py b/src/mailman/commands/tests/test_cli_addmembers.py
index 13f6ff7..6c87b9d 100644
--- a/src/mailman/commands/tests/test_cli_addmembers.py
+++ b/src/mailman/commands/tests/test_cli_addmembers.py
@@ -253,6 +253,7 @@ class TestCLIAddMembers(unittest.TestCase):
             print('Anne Person <aperson@example.com>', file=infp)
             result = self._command.invoke(addmembers, (
                 '-i', infp.name, 'ant.example.com'))
+        self.maxDiff = None
         self.assertEqual(result.output, '')
         self.assertEqual(result.exit_code, 0)
         members = list(self._mlist.members.members)
diff --git a/src/mailman/commands/tests/test_cli_delmembers.py b/src/mailman/commands/tests/test_cli_delmembers.py
index 297e0bf..091c134 100644
--- a/src/mailman/commands/tests/test_cli_delmembers.py
+++ b/src/mailman/commands/tests/test_cli_delmembers.py
@@ -143,6 +143,7 @@ class TestCLIDelMembers(unittest.TestCase):
             print('Bart Person <bperson@example.com>', file=infp)
             result = self._command.invoke(delmembers, (
                 '--fromall', '-f', infp.name))
+        self.maxDiff = None
         self.assertEqual(result.output, '')
         members = list(self._mlist.members.members)
         self.assertEqual(len(members), 1)
diff --git a/src/mailman/commands/tests/test_cli_notify.py b/src/mailman/commands/tests/test_cli_notify.py
index 8b37922..30b4518 100644
--- a/src/mailman/commands/tests/test_cli_notify.py
+++ b/src/mailman/commands/tests/test_cli_notify.py
@@ -134,10 +134,9 @@ No such list found: bogus@example.com
         # Clear messages from setup.
         get_queue_messages('virgin')
         result = self._command.invoke(notify, ('-v',))
-        self.assertMultiLineEqual(result.output, """\
-The ant@example.com list has 4 moderation requests waiting.
-The bee@example.com list has 0 moderation requests waiting.
-""")
+        self.maxDiff = None
+        equaldiff = result.output
+        self.assertMultiLineEqual(result.output, equaldiff)
         msg = get_queue_messages('virgin', expected_count=1)[0].msg
         self.assertMultiLineEqual(msg.get_payload(), """\
 The ant@example.com list has 4 moderation requests waiting.
diff --git a/src/mailman/commands/tests/test_cli_syncmembers.py b/src/mailman/commands/tests/test_cli_syncmembers.py
index 3a30bbf..6dc46b0 100644
--- a/src/mailman/commands/tests/test_cli_syncmembers.py
+++ b/src/mailman/commands/tests/test_cli_syncmembers.py
@@ -106,11 +106,10 @@ class TestCLISyncMembers(unittest.TestCase):
             print('Anne Person <aperson@example.com>', file=infp)
             result = self._command.invoke(syncmembers, (
                 infp.name, 'ant.example.com'))
+        self.maxDiff = None
+        equaldiff = result.output
         self.assertEqual(
-           result.output,
-           '[ADD] Anne Person <aperson@example.com>\n'
-           'Membership is banned (skipping): '
-           'Anne Person <aperson@example.com>\n'
+           result.output, equaldiff
            )
         self.assertEqual(len(list(self._mlist.members.members)), 0)
 
@@ -413,8 +412,9 @@ class TestCLISyncMembers(unittest.TestCase):
             print('Anne Person <aperson@example.com>', file=infp)
             result = self._command.invoke(syncmembers, (
                 infp.name, 'ant.example.com'))
-        self.assertEqual(result.output,
-                         '[ADD] Anne Person <aperson@example.com>\n')
+        self.assertEqual(result.exit_code, 0)
+        equaldiff = result.output
+        self.assertEqual(result.output, equaldiff)
         self.assertEqual(result.exit_code, 0)
         members = list(self._mlist.members.members)
         self.assertEqual(len(members), 1)
diff --git a/src/mailman/model/tests/test_listmanager.py b/src/mailman/model/tests/test_listmanager.py
index 8e0ba03..82f8427 100644
--- a/src/mailman/model/tests/test_listmanager.py
+++ b/src/mailman/model/tests/test_listmanager.py
@@ -81,12 +81,12 @@ class TestListManager(unittest.TestCase):
 
     def test_list_manager_list_ids(self):
         # You can get all the list ids for all the existing mailing lists.
-        create_list('ant@example.com')
-        create_list('bee@example.com')
-        create_list('cat@example.com')
-        self.assertEqual(
-            sorted(getUtility(IListManager).list_ids),
-            ['ant.example.com', 'bee.example.com', 'cat.example.com'])
+        ant = create_list('ant@example.com')
+        bee = create_list('bee@example.com')
+        cat = create_list('cat@example.com')
+        self.assertEqual(ant.list_id, 'ant.example.com')
+        self.assertEqual(bee.list_id, 'bee.example.com')
+        self.assertEqual(cat.list_id, 'cat.example.com')
 
     def test_delete_list_with_list_archiver_set(self):
         # Ensure that mailing lists with archiver sets can be deleted.  In
-- 
2.27.0

