diff options
| -rw-r--r-- | src/mailman/model/bans.py | 3 | ||||
| -rw-r--r-- | src/mailman/model/tests/test_bans.py | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mailman/model/bans.py b/src/mailman/model/bans.py index c2d6256c2..c8d43c5ae 100644 --- a/src/mailman/model/bans.py +++ b/src/mailman/model/bans.py @@ -114,7 +114,8 @@ class BanManager: @dbconnection def bans(self, store): """See `IBanManager`.""" - query = store.query(Ban).filter_by(list_id=self._list_id) + query = store.query(Ban).filter_by( + list_id=self._list_id).order_by(Ban.email) return QuerySequence(query) @dbconnection diff --git a/src/mailman/model/tests/test_bans.py b/src/mailman/model/tests/test_bans.py index c993a2043..03cd6e2c2 100644 --- a/src/mailman/model/tests/test_bans.py +++ b/src/mailman/model/tests/test_bans.py @@ -48,15 +48,15 @@ class TestMailingListBans(unittest.TestCase): ['bart@example.com']) def test_bans_sequence(self): - # Bans returns a pageable sequence. - self._manager.ban('bee@example.com') + # Bans returns a pageable sorted sequence. self._manager.ban('ant@example.com') + self._manager.ban('bee@example.com') # The results can be len()'d. self.assertEqual(len(self._manager.bans), 2) # The results can be iterated. self.assertEqual(['ant@example.com', 'bee@example.com'], - sorted(ban.email for ban in self._manager.bans)) + [ban.email for ban in self._manager.bans]) # The results can be indexed. self.assertEqual( - sorted([self._manager.bans[0].email, self._manager.bans[1].email]), + [self._manager.bans[0].email, self._manager.bans[1].email], ['ant@example.com', 'bee@example.com']) |