Re-enable pytest test runner in Travis.
@@ -28,9 +28,7 @@ matrix:
- travis/install.sh
script:
- source "${HOME}/INSTALL/bin/activate"
- # TODO(amoser): Change to
- # pytest grr/
- - grr_run_tests --processes=2
+ - pytest grr/ --ignore grr/gui/selenium_tests/
- travis/build_templates.sh
- travis/deploy_to_gcs.sh
@@ -61,9 +59,7 @@ matrix:
# - travis/install.sh
# script:
# - source "${HOME}/INSTALL/bin/activate"
- # # TODO(amoser): Change to
- # # pytest grr/client/ --ignore grr/client/linux/ --ignore grr/client/client_actions/linux/
- # - grr_run_tests --processes=2 --labels=client_action
+ # - pytest grr/client/ --ignore grr/gui/selenium_tests/ --ignore grr/client/linux/ --ignore grr/client/client_actions/linux/
# - travis/build_templates.sh
# - travis/deploy_to_gcs.sh
