tests: set default id to name

run-tests.sh

@@ -13,8 +13,18 @@ set -o errexit
 # Quit on unbound symbols
 set -o nounset
 
+# Check for arguments
+pytest_args=()
+for arg in $@; do
+	case ${arg} in
+		*)
+			pytest_args+=( ${arg} )
+			;;
+	esac
+done
+
 python -m check_manifest --ignore ".*-requirements.txt"
 python -m sphinx.cmd.build -qnN docs docs/_build/html
-python -m pytest
+python -m pytest ${pytest_args[@]+"${pytest_args[@]}"}
 tests_exit_code=$?
 exit "$tests_exit_code"

tests/conftest.py

@@ -170,6 +170,12 @@ class Role(db.Model, RoleMixin):
         name = db.Column(db.String(80), unique=True)
         description = db.Column(db.String(255))
 
+        def __init__(self, **kwargs):
+            if kwargs.get("name"):
+                kwargs.setdefault("id", kwargs.get("name"))
+            super().__init__(**kwargs)
+
+
     class User(db.Model, UserMixin):
         id = db.Column(db.Integer, primary_key=True)
         email = db.Column(db.String(255), unique=True)

tests/utils.py

@@ -31,7 +31,7 @@ def logout(client, endpoint=None, **kwargs):
 
 def create_roles(ds):
     for role in ('admin', 'editor', 'author'):
-        ds.create_role(id=role, name=role)
+        ds.create_role(name=role)
     ds.commit()