diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-10-30 23:55:43 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 23:55:43 +1100 |
| commit | 0dce9e1379ea867c9a00c8e6cf1d42badb52601d (patch) | |
| tree | 941dcf4454a602715d8c2d6728242c8f677a7fce /.travis.yml | |
| parent | Merge pull request #4109 from matrix-org/erikj/repl_devices (diff) | |
| download | synapse-0dce9e1379ea867c9a00c8e6cf1d42badb52601d.tar.xz | |
Write some tests for the email pusher (#4095)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index fd41841c77..655fab9d8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ branches: - develop - /^release-v/ +# When running the tox environments that call Twisted Trial, we can pass the -j +# flag to run the tests concurrently. We set this to 2 for CPU bound tests +# (SQLite) and 4 for I/O bound tests (PostgreSQL). matrix: fast_finish: true include: @@ -33,10 +36,10 @@ matrix: env: TOX_ENV="pep8,check_isort" - python: 2.7 - env: TOX_ENV=py27 + env: TOX_ENV=py27 TRIAL_FLAGS="-j 2" - python: 2.7 - env: TOX_ENV=py27-old + env: TOX_ENV=py27-old TRIAL_FLAGS="-j 2" - python: 2.7 env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4" @@ -44,10 +47,10 @@ matrix: - postgresql - python: 3.5 - env: TOX_ENV=py35 + env: TOX_ENV=py35 TRIAL_FLAGS="-j 2" - python: 3.6 - env: TOX_ENV=py36 + env: TOX_ENV=py36 TRIAL_FLAGS="-j 2" - python: 3.6 env: TOX_ENV=py36-postgres TRIAL_FLAGS="-j 4" |