diff options
| author | Neil Johnson <neil@matrix.org> | 2018-11-02 15:24:00 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-11-02 15:24:00 +0000 |
| commit | cdb3aaee1c8fa5f25375675b71e9b7211301c950 (patch) | |
| tree | 67ddb5b116349e4eee7f9d729b709b8a546b0758 /.travis.yml | |
| parent | Merge branch 'neilj/create_support_user' of github.com:matrix-org/synapse int... (diff) | |
| parent | Merge pull request #4137 from matrix-org/erikj/clean_up_events (diff) | |
| download | synapse-cdb3aaee1c8fa5f25375675b71e9b7211301c950.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/create_support_user
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" |