From 65abca3fbaca3b391f106dbf9e93da797a20cfa6 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Tue, 15 Aug 2017 17:10:27 +0100 Subject: [PATCH] Bug 1390517 - Travis: Rebalance Python test job chunks The split of test directories between each Python chunk has been adjusted to more evenly balance runtime. The `tests/e2e` directory has been moved from chunk B to chunk A, and the `tests/webapp/embed` + `tests/webapp/graphql` directories from chunk C to chunk A. Short of moving tests in the `tests/webapp/api` directory around, this is the best we can do for now. Hopefully bug 1348947 can improve the situation in the future. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2a336ec1..413c8b4dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,10 +89,10 @@ matrix: # 'https://' being in the site URL. In addition, we override the test environment's debug # value so the tests pass. The real environment variable will be checked during deployment. - SITE_URL='https://treeherder.dev' TREEHERDER_DEBUG='False' ./manage.py check --deploy --fail-level WARNING - - py.test tests/ --runslow --ignore=tests/e2e/ --ignore=tests/etl/ --ignore=tests/log_parser/ --ignore=tests/webapp/ --ignore=tests/selenium/ --ignore=tests/jenkins/ + - pytest tests/ --runslow --ignore=tests/etl/ --ignore=tests/log_parser/ --ignore=tests/webapp/api/ --ignore=tests/selenium/ --ignore=tests/jenkins/ # Job 4: Python Tests Chunk B - - env: python-tests-e2e-etl-logparser + - env: python-tests-etl-logparser language: python python: "2.7.13" cache: @@ -116,10 +116,10 @@ matrix: before_script: - while ! curl "$ELASTICSEARCH_URL" &> /dev/null; do sleep 1; done script: - - py.test tests/e2e/ tests/etl/ tests/log_parser/ --runslow + - pytest tests/etl/ tests/log_parser/ --runslow # Job 5: Python Tests Chunk C - - env: python-tests-webapp + - env: python-tests-rest-api language: python python: "2.7.13" cache: @@ -143,7 +143,7 @@ matrix: before_script: - while ! curl "$ELASTICSEARCH_URL" &> /dev/null; do sleep 1; done script: - - py.test tests/webapp/ --runslow + - pytest tests/webapp/api/ --runslow # Job 6: Python Tests - Selenium integration - env: python-tests-selenium