summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-07-08 15:32:38 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-07-08 15:58:38 -0400
commite2d4b2e72cb97bc5612fa9d1ec7d0ab15d38efe1 (patch)
treec0d4ec52e00e89f2cd23790a44f8ece800882420
parent54b0cebc2b22475e4ae153d7e84ecb953797f4c5 (diff)
downloadsqlalchemy-e2d4b2e72cb97bc5612fa9d1ec7d0ab15d38efe1.tar.gz
Propose --nomemory by default
the memory tests are solely responsible for the largest chunk of time and CPU energy taken up in running the tests. Regressions in this area are nonexistent unless major changes are being taken up. Try to revert them to False and see if a single gerrit job can perhaps run these. Change-Id: Ibaead2d1c0a76f1339bee63652a8aead689e8b75
-rw-r--r--tox.ini10
1 files changed, 6 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 460f191cf..83b81a0da 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,6 +46,7 @@ whitelist_externals=sh
setenv=
PYTHONPATH=
PYTHONNOUSERSITE=1
+ MEMUSAGE=--nomemory
BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
WORKERS={env:TOX_WORKERS:-n4 --max-worker-restart=5}
@@ -60,8 +61,9 @@ setenv=
oracle: ORACLE={env:TOX_ORACLE:--db oracle}
mssql: MSSQL={env:TOX_MSSQL:--db mssql}
oracle,mssql,sqlite_file: IDENTS=--write-idents db_idents.txt
- oracle,mssql,sqlite_file: NOMEMORY=--nomemory
+ oracle,mssql,sqlite_file: MEMUSAGE=--nomemory
backendonly: BACKENDONLY=--backend-only
+ memusage: MEMUSAGE='-k test_memusage'
# tox as of 2.0 blocks all environment variables from the
# outside, unless they are here (or in TOX_TESTENV_PASSENV,
@@ -72,7 +74,7 @@ passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_S
commands=
cext: /bin/true
nocext: sh -c "rm -f lib/sqlalchemy/*.so"
- {env:BASECOMMAND} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
+ {env:BASECOMMAND} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
# thanks to https://julien.danjou.info/the-best-flake8-extensions/
@@ -95,11 +97,11 @@ commands =
# command run in the github action when cext are active.
[testenv:github-cext]
commands=
- python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
+ python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
# command run in the github action when cext are not active.
[testenv:github-nocext]
commands=
- python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
+ python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt