Skip to content

Commit f195738

Browse files
committed
tests: set default id to name
1 parent 484d992 commit f195738

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

run-tests.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,18 @@ set -o errexit
1313
# Quit on unbound symbols
1414
set -o nounset
1515

16+
# Check for arguments
17+
pytest_args=()
18+
for arg in $@; do
19+
case ${arg} in
20+
*)
21+
pytest_args+=( ${arg} )
22+
;;
23+
esac
24+
done
25+
1626
python -m check_manifest --ignore ".*-requirements.txt"
1727
python -m sphinx.cmd.build -qnN docs docs/_build/html
18-
python -m pytest
28+
python -m pytest ${pytest_args[@]+"${pytest_args[@]}"}
1929
tests_exit_code=$?
2030
exit "$tests_exit_code"

tests/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,12 @@ class Role(db.Model, RoleMixin):
170170
name = db.Column(db.String(80), unique=True)
171171
description = db.Column(db.String(255))
172172

173+
def __init__(self, **kwargs):
174+
if not kwargs.get("id") and kwargs.get("name"):
175+
kwargs["id"] = kwargs["name"]
176+
super().__init__(**kwargs)
177+
178+
173179
class User(db.Model, UserMixin):
174180
id = db.Column(db.Integer, primary_key=True)
175181
email = db.Column(db.String(255), unique=True)

tests/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def logout(client, endpoint=None, **kwargs):
3131

3232
def create_roles(ds):
3333
for role in ('admin', 'editor', 'author'):
34-
ds.create_role(id=role, name=role)
34+
ds.create_role(name=role)
3535
ds.commit()
3636

3737

0 commit comments

Comments
 (0)