Add emailuser test run to Travis

.travis.yml

@@ -21,6 +21,8 @@ matrix:
      python: 3.8
    - env: TOXENV=py38-dj31-postgres-noelasticsearch
      python: 3.8
+   - env: TOXENV=py38-dj31-postgres-noelasticsearch-emailuser
+     python: 3.8
    - env: TOXENV=py38-dj31stable-postgres-noelasticsearch
      python: 3.8
    - env: TOXENV=py38-djmaster-postgres-noelasticsearch
@@ -37,6 +39,8 @@ matrix:
      python: 3.8
    - env: TOXENV=py38-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
      python: 3.8
+   - env: TOXENV=py38-dj31-postgres-elasticsearch7-emailuser INSTALL_ELASTICSEARCH7=yes
+     python: 3.8
   allow_failures:
     # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky
     - env: TOXENV=py36-dj22-sqlite-elasticsearch2 INSTALL_ELASTICSEARCH2=yes
@@ -45,6 +49,7 @@ matrix:
     - env: TOXENV=py38-dj22-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     - env: TOXENV=py38-dj30-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
     - env: TOXENV=py38-dj31-postgres-elasticsearch7 INSTALL_ELASTICSEARCH7=yes
+    - env: TOXENV=py38-dj31-postgres-elasticsearch7-emailuser INSTALL_ELASTICSEARCH7=yes
     # allow failures against Django pre-releases on git
     - env: TOXENV=py38-dj31stable-postgres-noelasticsearch
     - env: TOXENV=py38-djmaster-postgres-noelasticsearch

runtests.py

@@ -67,7 +67,8 @@ def runtests():
         # forcibly delete the ELASTICSEARCH_URL setting to skip those tests
         del os.environ['ELASTICSEARCH_URL']
 
-    os.environ['USE_EMAIL_USER_MODEL'] = '1' if args.emailuser else ''
+    if args.emailuser:
+        os.environ['USE_EMAIL_USER_MODEL'] = '1'
 
     if args.bench:
         benchmarks = [

tox.ini

@@ -2,7 +2,7 @@
 skipsdist = True
 usedevelop = True
 
-envlist = py{35,36,37,38}-dj{22,30,31,31stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch},
+envlist = py{36,37,38}-dj{22,30,31,31stable,master}-{sqlite,postgres,mysql,mssql}-{elasticsearch7,elasticsearch6,elasticsearch5,elasticsearch2,noelasticsearch}-{customuser,emailuser},
 
 [testenv]
 install_command = pip install -e ".[testing]" -U {opts} {packages}
@@ -14,7 +14,6 @@ commands =
     noelasticsearch: coverage run runtests.py {posargs}
 
 basepython =
-    py35: python3.5
     py36: python3.6
     py37: python3.7
     py38: python3.8
@@ -48,6 +47,8 @@ setenv =
 
     sqlite: DATABASE_NAME=wagtail.db
 
+    emailuser: USE_EMAIL_USER_MODEL=yes
+
     # Specific for Appveyor, see:
     # https://www.appveyor.com/docs/services-databases/#sql-server-2016
     mssql: DATABASE_ENGINE=sql_server.pyodbc
@@ -57,6 +58,6 @@ setenv =
     mssql: DATABASE_PASS=Password12!
 
 [testenv:flake8]
-basepython=python3.5
+basepython=python3.6
 deps=flake8>=2.2.0
 commands=flake8 wagtail