Skip to content

build: use MariaDB in CI #168

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
arcstur merged 2 commits into from
Feb 26, 2026
Merged

build: use MariaDB in CI #168

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
96a3ab9
build: use MariaDB in CI
arcstur Feb 26, 2026
677a3c6
refactor: update deprected assertEquals to assertEqual
arcstur Feb 26, 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
52 changes: 34 additions & 18 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,24 @@ jobs:

runs-on: ubuntu-latest

strategy:
max-parallel: 4
matrix:
python-version: [3.11, 3.12]

services:
postgres:
image: postgres
ports:
- 5432
mariadb:
image: mariadb:11.7.2
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: 'postgres'
POSTGRES_DB: editgroups
MARIADB_DATABASE: editgroups
MARIADB_ROOT_PASSWORD: editgroups
ports:
- 3306
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
--health-cmd="healthcheck.sh --connect --innodb_initialized"
--health-interval=10s
--health-timeout=5s
--health-retries=3
redis:
image: redis
ports:
Expand All @@ -36,20 +40,32 @@ jobs:
--health-retries 5

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.11
uses: actions/setup-python@v2
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: 3.11
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools
pip install -r requirements.txt
pip install psycopg2-binary==2.9.7 coveralls
pip install mysqlclient==2.2.7 coveralls
pip freeze
echo "from .dev import *" > editgroups/settings/__init__.py
cat editgroups/settings/secret_gh_action.py | sed -e "s/POSTGRES_PORT/${{ job.services.postgres.ports[5432] }}/g" | sed -e "s/REDIS_REAL_PORT/${{ job.services.redis.ports[6379] }}/g" > editgroups/settings/secret.py
- name: Run Django tests
cat editgroups/settings/secret_gh_action.py | sed -e "s/MARIADB_PORT/${{ job.services.mariadb.ports[3306] }}/g" | sed -e "s/REDIS_REAL_PORT/${{ job.services.redis.ports[6379] }}/g" > editgroups/settings/secret.py

- name: Verify MariaDB connection
env:
PORT: ${{ job.services.mariadb.ports[3306] }}
run: |
while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
sleep 1
done

- name: Run tests
run: |
coverage run --source=editgroups,store,revert,tagging --omit=*/migrations/*,edtigroups/settings/* manage.py test -v 2
env:
Expand Down
19 changes: 10 additions & 9 deletions editgroups/settings/secret_gh_action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
SECRET_KEY = '20oj&tj8uaruseitlrise,tries,uirsetur36746209etus7e'

# Database
# https://docs.djangoproject.com/en/1.7/ref/settings/#databases

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'editgroups',
'USER': 'postgres',
'PASSWORD': 'postgres',
'HOST': 'localhost',
'PORT': 'POSTGRES_PORT',
'DISABLE_SERVER_SIDE_CURSORS': False,
'ENGINE': 'django.db.backends.mysql',
'HOST': '127.0.0.1',
'PORT': 'MARIADB_PORT',
'NAME': 'editgroups',
'USER': 'root',
'PASSWORD': 'editgroups',
'OPTIONS': {
'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
'charset': 'utf8mb4',
},
}
}

Expand Down
36 changes: 18 additions & 18 deletions revert/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ def test_revert_not_logged_in(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(401, response.status_code)
self.assertEqual(401, response.status_code)

def test_revert_invalid_batch(self):
response = self.client.post(
reverse('submit-revert', args=['NOTATOOL', 'uster']),
data={'comment':'testing reverts'})
self.assertEquals(404, response.status_code)
self.assertEqual(404, response.status_code)

def test_revert_batch_already_reverted(self):
Edit.objects.all().update(reverted=True)
Expand All @@ -59,7 +59,7 @@ def test_revert_batch_already_reverted(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(400, response.status_code)
self.assertEqual(400, response.status_code)

def test_revert_batch_archived(self):
b = Batch.objects.get()
Expand All @@ -68,38 +68,38 @@ def test_revert_batch_archived(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(400, response.status_code)
self.assertEqual(400, response.status_code)

def test_revert_batch_already_being_reverted(self):
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
task.save()

batch = Batch.objects.get(id=self.batch.id)
self.assertEquals(task, batch.active_revert_task)
self.assertEqual(task, batch.active_revert_task)

response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(400, response.status_code)
self.assertEqual(400, response.status_code)

def test_revert_batch_no_summary(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={})
self.assertEquals(400, response.status_code)
self.assertEqual(400, response.status_code)

@patch.object(RevertTask, 'revert_edit', fake_revert)
def test_revert_batch_fine(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(302, response.status_code)
self.assertEqual(302, response.status_code)

def test_initiate_revert_fine(self):
response = self.client.get(
reverse('initiate-revert', args=[self.batch.tool.shortid,
self.batch.uid]))
self.assertEquals(200, response.status_code)
self.assertEqual(200, response.status_code)

@patch.object(RevertTask, 'revert_edit', fake_revert)
def test_revert_batch_previous_canceled(self):
Expand All @@ -109,56 +109,56 @@ def test_revert_batch_previous_canceled(self):
response = self.client.post(
reverse('submit-revert', args=[self.batch.tool.shortid, self.batch.uid]),
data={'comment':'testing reverts'})
self.assertEquals(302, response.status_code)
self.assertEquals(2, RevertTask.objects.count())
self.assertEqual(302, response.status_code)
self.assertEqual(2, RevertTask.objects.count())

def test_stop_not_logged_in(self):
self.client.logout()
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
task.save()
response = self.client.post(
reverse('stop-revert', args=[self.batch.tool.shortid, self.batch.uid]))
self.assertEquals(401, response.status_code)
self.assertEqual(401, response.status_code)

def test_stop_no_task(self):
response = self.client.post(
reverse('stop-revert', args=[self.batch.tool.shortid, self.batch.uid]))
self.assertEquals(404, response.status_code)
self.assertEqual(404, response.status_code)

def test_stop_different_user(self):
task = RevertTask(batch=self.batch, user=self.john, comment="Already reverting")
task.save()
response = self.client.post(
reverse('stop-revert', args=[self.batch.tool.shortid, self.batch.uid]))
self.assertEquals(403, response.status_code)
self.assertEqual(403, response.status_code)

def test_stop_task_already_complete(self):
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
task.complete = True
task.save()
response = self.client.post(
reverse('stop-revert', args=[self.batch.tool.shortid, self.batch.uid]))
self.assertEquals(404, response.status_code)
self.assertEqual(404, response.status_code)

def test_stop_fine(self):
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
task.save()
response = self.client.post(
reverse('stop-revert', args=[self.batch.tool.shortid, self.batch.uid]))
self.assertEquals(302, response.status_code)
self.assertEqual(302, response.status_code)
task = RevertTask.objects.get(id=task.id)
self.assertTrue(task.cancel)

def test_oauth_tokens(self):
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
self.assertEquals({'oauth_token':'12345','oauth_token_secret':'67890'},
self.assertEqual({'oauth_token':'12345','oauth_token_secret':'67890'},
task.oauth_tokens)

def test_oauth_tokens_canceled(self):
task = RevertTask(batch=self.batch, user=self.mary, comment="Already reverting")
task.cancel = True
with self.assertRaises(ValueError):
self.assertEquals({'oauth_token':'12345','oauth_token_secret':'67890'},
self.assertEqual({'oauth_token':'12345','oauth_token_secret':'67890'},
task.oauth_tokens)

def test_summary(self):
Expand Down
Loading