diff --git a/.travis.yml b/.travis.yml index 6b7a299..d49201d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,10 +58,11 @@ env: jobs: fast_finish: true allow_failures: - # - env: DB=mariadb:10.5 SQLALCHEMY=1 - - env: srv=build v=10.6 + - env: srv=maxscale + - env: srv=skysql RUN_LONG_TEST=0 + - env: srv=skysql-ha RUN_LONG_TEST=0 + include: - - env: srv=mariadb v=10.2 local=1 - env: srv=mariadb v=10.3 local=1 - env: srv=mariadb v=10.4 local=1 - env: srv=mariadb v=10.5 local=1 @@ -72,6 +73,7 @@ jobs: - env: srv=mariadb v=10.6 local=1 PYTHON_VER="3.10" - env: srv=mariadb v=10.6 local=1 PYTHON_VER="3.10" BENCH=1 - env: srv=mariadb v=10.7 local=1 + - env: srv=mariadb v=10.8 local=1 - if: type = push AND fork = false env: srv=maxscale - if: type = push AND fork = false @@ -86,7 +88,7 @@ jobs: env: srv=mysql v=5.7 - if: type = push AND fork = false env: srv=mysql v=8.0 - - env: srv=mariadb v=10.7 local=1 PYTHON_VER="3.10" + - env: srv=mariadb v=10.8 local=1 PYTHON_VER="3.10" os: osx osx_image: xcode13.3 compiler: gcc diff --git a/testing/test/integration/test_cursor.py b/testing/test/integration/test_cursor.py index 2184bd2..365d3d5 100644 --- a/testing/test/integration/test_cursor.py +++ b/testing/test/integration/test_cursor.py @@ -16,7 +16,6 @@ from test.base_test import create_connection, is_maxscale, is_mysql server_indicator_version = 100206 - class foo(int): def bar(self): pass @@ -1178,6 +1177,10 @@ class TestCursor(unittest.TestCase): def test_conpy194(self): if is_mysql(): self.skipTest("Skip (MySQL)") + + if (self.connection.server_version < 105000): + self.skipTest("Insert returning requires MariaDB >= 10.5") + conn= create_connection() cursor= conn.cursor()