Skip to content

serverdb: Fix false commit conflict on datetimes #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kofrezo merged 2 commits into from
Jul 1, 2026
Merged

serverdb: Fix false commit conflict on datetimes #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce278e3
serverdb: Fix false commit conflict on datetimes
kofrezo Jul 1, 2026
c2b1151
Run tests in parallel
kofrezo Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: |
# This will use Python's standard unit test discovery feature.
pipenv run python -m unittest discover adminapi -v
pipenv run python -Wall -m serveradmin test --noinput --parallel=1
pipenv run python -Wall -m serveradmin test --noinput --parallel=10
# Build sphinx docs, error on warning
cd docs
SPHINXBUILD='pipenv run sphinx-build' SPHINXOPTS='-W' make html
2 changes: 1 addition & 1 deletion serveradmin/serverdb/query_committer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ def _validate_commit(changes, servers):
newer.append((object_id, attr, server[attr]))
elif action == 'update' or action == 'delete':
try:
if json_encode_extra(server[attr]) != str(change['old']):
if json_encode_extra(server[attr]) != json_encode_extra(change['old']):
newer.append((object_id, attr, server[attr]))
except KeyError:
newer.append((object_id, attr, None))
Expand Down
Loading