fixed testing

beer-garden · Mar 12, 2024 · da29301 · da29301
1 parent af9e8a6
commit da29301
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/brewtils/models.py b/brewtils/models.py
@@ -1676,12 +1676,13 @@ def __str__(self):
 
     def __repr__(self):
         return (
-            "<Role: id=%s, name=%s, permission=%s, scope_garden=%s, "
+            "<Role: id=%s, name=%s, description=%s, permission=%s, scope_garden=%s, "
             "scope_namespaces=%s, scope_systems=%s, scope_instances=%s, "
             "scope_versions=%s, scope_commands=%s>"
         ) % (
             self.id,
             self.name,
+            self.description,
             self.permission,
             self.scope_gardens,
             self.scope_namespaces,

diff --git a/brewtils/schemas.py b/brewtils/schemas.py
@@ -558,10 +558,10 @@ class ResolvableSchema(BaseSchema):
 
 
 class RoleSchema(BaseSchema):
+    permission = fields.Str()
+    description = fields.Str(allow_none=True)
     id = fields.Str(allow_none=True)
     name = fields.Str()
-    description = fields.Str(allow_none=True)
-    permission = fields.Str()
     scope_gardens = fields.List(fields.Str(), allow_none=True)
     scope_namespaces = fields.List(fields.Str(), allow_none=True)
     scope_systems = fields.List(fields.Str(), allow_none=True)

diff --git a/brewtils/test/comparable.py b/brewtils/test/comparable.py
@@ -245,6 +245,7 @@ def assert_user_equal(obj1, obj2, do_raise=False):
         obj2,
         expected_type=User,
         deep_fields={
+            "local_roles": partial(assert_role_equal, do_raise=True),
             "remote_roles": partial(assert_role_equal, do_raise=True),
             "remote_user_mapping": partial(assert_remote_user_map_equal, do_raise=True),
         },

diff --git a/test/models_test.py b/test/models_test.py
@@ -548,14 +548,14 @@ def test_repr(self, user):
 class TestRole(object):
     @pytest.fixture
     def role(self):
-        return Role(name="bg-admin", permission="ADMIN")
+        return Role(name="bg-admin", permission="PLUGIN_ADMIN")
 
     def test_str(self, role):
         assert str(role) == "bg-admin"
 
     def test_repr(self, role):
         assert repr(role) == (
-            "<Role: id=None, name=bg-admin, permission=ADMIN, "
+            "<Role: id=None, name=bg-admin, description=None, permission=PLUGIN_ADMIN, "
             "scope_garden=[], scope_namespaces=[], scope_systems=[], "
             "scope_instances=[], scope_versions=[], scope_commands=[]>"
         )