Skip to content

Commit e2d4b2e

Browse files
zzzeekzzzeek
committed
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
1 parent 54b0ceb commit e2d4b2e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

‎tox.ini‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ whitelist_externals=sh
4646
setenv=
4747
PYTHONPATH=
4848
PYTHONNOUSERSITE=1
49+
MEMUSAGE=--nomemory
4950
BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
5051

5152
WORKERS={env:TOX_WORKERS:-n4 --max-worker-restart=5}
@@ -60,8 +61,9 @@ setenv=
6061
oracle: ORACLE={env:TOX_ORACLE:--db oracle}
6162
mssql: MSSQL={env:TOX_MSSQL:--db mssql}
6263
oracle,mssql,sqlite_file: IDENTS=--write-idents db_idents.txt
63-
oracle,mssql,sqlite_file: NOMEMORY=--nomemory
64+
oracle,mssql,sqlite_file: MEMUSAGE=--nomemory
6465
backendonly: BACKENDONLY=--backend-only
66+
memusage: MEMUSAGE='-k test_memusage'
6567

6668
# tox as of 2.0 blocks all environment variables from the
6769
# 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
7274
commands=
7375
cext: /bin/true
7476
nocext: sh -c "rm -f lib/sqlalchemy/*.so"
75-
{env:BASECOMMAND} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
77+
{env:BASECOMMAND} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
7678
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
7779

7880
# thanks to https://julien.danjou.info/the-best-flake8-extensions/
@@ -95,11 +97,11 @@ commands =
9597
# command run in the github action when cext are active.
9698
[testenv:github-cext]
9799
commands=
98-
python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
100+
python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
99101
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
100102

101103
# command run in the github action when cext are not active.
102104
[testenv:github-nocext]
103105
commands=
104-
python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
106+
python -m pytest {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:MEMUSAGE:} {env:COVERAGE:} {posargs}
105107
oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt

0 commit comments

Comments
 (0)