diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a251a26..3553f6b9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ jobs: python3 --version mysqld --version . venv/bin/activate - py.test -n 0 --mysql-user circleci --mysql-mysqld /usr/sbin/mysqld -c pytest.ini + py.test -n 0 --mysql-user circleci --mysql-mysqld /usr/sbin/mysqld -c aetup.cfg - store_artifacts: path: test-reports diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 10e42a1b..00000000 --- a/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -addopts = --max-slave-restart=0 --showlocals --verbose --cov src/pytest_mysql --cov tests -mysql_dbname = pytestmysql -testpaths = tests -xfail_strict = true diff --git a/setup.cfg b/setup.cfg index b72fc5fa..2c7ab09a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -4,4 +4,10 @@ exclude = docs/*,build/*,venv/* [pydocstyle] ignore = D203,D212 -match = '(?!docs|build|venv).*\.py' \ No newline at end of file +match = '(?!docs|build|venv).*\.py' + +[tool:pytest] +addopts = --max-worker-restart=0 --showlocals --verbose --cov src/pytest_mysql --cov tests +mysql_dbname = pytestmysql +testpaths = tests +xfail_strict = true