From 18569482f1d04e84159e99d71aab5c28883f2786 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Thu, 8 Jun 2023 15:23:57 +0200
Subject: [PATCH] Enforce order also on multiple room descs

---
 evennia/contrib/grid/extended_room/extended_room.py | 2 +-
 evennia/contrib/grid/extended_room/tests.py         | 6 +++---
 evennia/objects/tests.py                            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/evennia/contrib/grid/extended_room/extended_room.py b/evennia/contrib/grid/extended_room/extended_room.py
index d76bc8ba8a..b8c1581423 100644
--- a/evennia/contrib/grid/extended_room/extended_room.py
+++ b/evennia/contrib/grid/extended_room/extended_room.py
@@ -345,7 +345,7 @@ class ExtendedRoom(DefaultRoom):
             **{None: self.db.desc or ""},
             **{
                 attr.key[5:]: attr.value
-                for attr in self.db_attributes.filter(db_key__startswith="desc_")
+                for attr in self.db_attributes.filter(db_key__startswith="desc_").order_by("db_key")
             },
         }
 
diff --git a/evennia/contrib/grid/extended_room/tests.py b/evennia/contrib/grid/extended_room/tests.py
index e5e8729c21..05e1143f75 100644
--- a/evennia/contrib/grid/extended_room/tests.py
+++ b/evennia/contrib/grid/extended_room/tests.py
@@ -219,12 +219,12 @@ Base room description.
             f"""
 Room Room(#{self.room1.id}) Season: autumn. Time: afternoon. States: None
 
-Room state spring:
-Spring description.
-
 Room state burning:
 Burning description.
 
+Room state spring:
+Spring description.
+
 Room state (default) (active):
 Base room description.
                  """.strip(),
diff --git a/evennia/objects/tests.py b/evennia/objects/tests.py
index 4807069ba5..de8ac2d478 100644
--- a/evennia/objects/tests.py
+++ b/evennia/objects/tests.py
@@ -370,8 +370,8 @@ class TestProperties(EvenniaTestCase):
         # add extra tag to category
         obj.tags.add("category_tag2", category="tagcategory1")
         self.assertEqual(
-            obj.tags.get(category="tagcategory1"),
-            ["category_tag1", "category_tag2"],
+            set(obj.tags.get(category="tagcategory1")),
+            set(["category_tag1", "category_tag2"]),
         )
         self.assertEqual(set(obj.tagcategory1), set(["category_tag1", "category_tag2"]))