Merge branch 'testcontainers' of 'https://github.com/jjmerchante/grim…

…oirelab-sortinghat' Merges #942 Closes #942
chaoss · Nov 15, 2024 · 6720315 · 6720315
2 parents 7b44ec9 + 5a99941
commit 6720315
Show file tree

Hide file tree

Showing 6 changed files with 241 additions and 38 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,14 +34,6 @@ jobs:
   tests:
     needs: [build]
     runs-on: ubuntu-latest
-    services:
-      mysql:
-        image: mariadb:10.5
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     name: Python ${{ matrix.python-version }}
     strategy:
@@ -71,13 +63,6 @@ jobs:
         run: |
           poetry install --only dev --no-root
 
-      - name: Set MySQL mode
-        env:
-          DB_HOST: 127.0.0.1
-          DB_PORT: ${{ job.services.mysql.ports[3306] }}
-        run: |
-          mysql --host $DB_HOST --port $DB_PORT -uroot -proot -e "SET GLOBAL sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'";
-
       - name: Test package backend
         run: |
           PACKAGE=`(cd dist && ls *whl)` && echo $PACKAGE

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,16 +13,6 @@ on:
 jobs:
 
   backend:
-
-    services:
-      mysql:
-        image: mariadb:10.5
-        env:
-          MYSQL_ROOT_PASSWORD: root
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12']
@@ -44,12 +34,6 @@ jobs:
       run: |
         poetry install -vvv
         poetry run pip install -r requirements_dev.txt
-    - name: Set MySQL mode
-      env:
-        DB_HOST: 127.0.0.1
-        DB_PORT: ${{ job.services.mysql.ports[3306] }}
-      run: |
-        mysql --host $DB_HOST --port $DB_PORT -uroot -proot -e "SET GLOBAL sql_mode = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION'";
     - name: Lint with flake8
       run: |
         poetry run flake8

diff --git a/config/settings/config_testing.py b/config/settings/config_testing.py
@@ -57,6 +57,8 @@
     }
 }
 
+TEST_DATABASE_IMAGE = "mariadb:11.4"
+
 TEST_RUNNER = 'tests.runners.SkipMultiTenantTestRunner'
 
 USE_TZ = True

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -77,6 +77,7 @@ google-auth = "^2.18.0"
 fakeredis = "^2.0.0"
 httpretty = "^1.1.4"
 flake8 = "^7.1.1"
+testcontainers = "^4.8.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,8 @@ @@
         }
     }
+    TEST_DATABASE_IMAGE = "mariadb:11.4"
     TEST_RUNNER = 'tests.runners.SkipMultiTenantTestRunner'
     USE_TZ = True
@@ Expand Down @@