Merge pull request #342 from p-l-/fix-tests

Travis CI: fix install & tests
This commit is contained in:
Pierre Lalet 2016-11-10 16:08:50 +00:00 committed by GitHub
commit a49473c783
2 changed files with 10 additions and 5 deletions

View File

@ -1,7 +1,11 @@
# Install dependencies using pip
if [ -z $TRAVIS_SUDO ] && [ "$TRAVIS_OS_NAME" = "osx" ]
then
PIP_INSTALL_FLAGS="--user"
if [ -z "$TRAVIS_SUDO" -o "$TRAVIS_SUDO" = "false" ]
then
TRAVIS_SUDO=""
if [ "$TRAVIS_OS_NAME" = "osx" ]
then
PIP_INSTALL_FLAGS="--user"
fi
fi
$TRAVIS_SUDO pip install $PIP_INSTALL_FLAGS ecdsa mock

View File

@ -1,10 +1,11 @@
# Dump Scapy config
python -c "from scapy.all import *; print conf"
# Don't run tests that requires root privileges
if [ -z $TRAVIS_SUDO ]
# Don't run tests that require root privileges
if [ -z "$TRAVIS_SUDO" -o "$TRAVIS_SUDO" = "false" ]
then
UT_FLAGS="-K netaccess "
TRAVIS_SUDO=""
fi
# Test AEAD modes in IPSec if available