From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 8 Jul 2020 19:32:38 +0000 (-0400)
Subject: Propose --nomemory by default
X-Git-Tag: rel_1_3_19~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3c53ce42c43cc4f4eb044cacfe28f95d946b0eb;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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
(cherry picked from commit e2d4b2e72cb97bc5612fa9d1ec7d0ab15d38efe1)
---

diff --git a/tox.ini b/tox.ini
index 31e4d1892a..a81f64d2e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -55,6 +55,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}
@@ -68,8 +69,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,
@@ -79,7 +81,7 @@ passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_S
 # for nocext, we rm *.so in lib in case we are doing usedevelop=True
 commands=
   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/
@@ -99,11 +101,11 @@ commands = flake8 ./lib/ ./test/ ./examples/ setup.py {posargs}
 # 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