]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Propose --nomemory by default
authorMike Bayer <mike_mp@zzzcomputing.com>
Wed, 8 Jul 2020 19:32:38 +0000 (15:32 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Wed, 8 Jul 2020 19:58:38 +0000 (15:58 -0400)
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

tox.ini

diff --git a/tox.ini b/tox.ini
index 460f191cf83f1a58f27a6b9f4e696e4061347622..83b81a0da14fae4584a4874bec8483ce26ede9b6 100644 (file)
--- 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