From 4d43a1baa90381503ecfdd7640de44eac08ca7ab Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Thu, 25 Mar 2021 08:37:47 +0000
Subject: [PATCH] default_stream_groups: Keep list of streams sorted by stream
 name.

Since the list of streams returned by a query which is not sorted
can vary, the tests which use it become flaky.
NormalActionsTest.test_default_stream_groups_events became
flaky due to this and hopefully sorting the streams should
fix it.
---
 zerver/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zerver/models.py b/zerver/models.py
index d28ebd6da8..faa808e603 100644
--- a/zerver/models.py
+++ b/zerver/models.py
@@ -2999,7 +2999,7 @@ class DefaultStreamGroup(models.Model):
             name=self.name,
             id=self.id,
             description=self.description,
-            streams=[stream.to_dict() for stream in self.streams.all()],
+            streams=[stream.to_dict() for stream in self.streams.all().order_by("name")],
         )