Permalink
Browse files

Merge pull request #1362 from privacyidea/travis_check_bytes

Update travis configuration
  • Loading branch information...
cornelinux committed Jan 2, 2019
2 parents 7a7c855 + 327601f commit b837f39e9f229a9ede001f2ecc004e5060c08645
Showing with 13 additions and 10 deletions.
  1. +5 −4 .travis.yml
  2. +1 −1 requirements.txt
  3. +7 −0 tests/conftest.py
  4. +0 −5 tests/test-migrate.sh
@@ -2,7 +2,6 @@ language: python
sudo: false
python:
- 2.7
- 3.4
- 3.5
- 3.6
# command to install dependencies
@@ -13,20 +12,22 @@ install:
- "pip install codecov"
- "pip install -r requirements.txt"
- "pip install smpplib"

# split the test run according to
# http://blog.travis-ci.com/2012-11-28-speeding-up-your-tests-by-parallelizing-them/
env:
global:
- PYTHONHASHSEED=random
- PYTHONHASHSEED=random # test for ordered dict use
matrix:
- TESTS=tests/

matrix:
allow_failures:
- python: 3.4
- python: 3.5
- python: 3.6

# command to run tests
script: "nosetests -v --with-coverage --cover-package=privacyidea $TESTS"
script: "python -b -m pytest -v --cov=privacyidea $TESTS"

after_success:
- codecov
@@ -47,7 +47,7 @@ pymysql-sa==1.0
pyOpenSSL==18.0.0
pyparsing==2.2.0
pyrad==2.1
pytest==3.6.0
pytest==3.6.1
pytest-cov==2.5.1
pytest-runner==4.2
python-dateutil==2.7.3
@@ -0,0 +1,7 @@
import sys

collect_ignore = []
if sys.version_info[0] > 2:
collect_ignore.append("test_mod_apache.py")
collect_ignore.append("test_lib_smsprovider.py")

This file was deleted.

Oops, something went wrong.

0 comments on commit b837f39

Please sign in to comment.