Changing travis and tests to run filecheck in Python 3

pull/8/head
Dan Puttick 2016-12-16 14:09:13 -05:00
parent 7bafff3699
commit cb4ae5deec
2 changed files with 3 additions and 9 deletions

View File

@ -47,11 +47,9 @@ install:
- unzip pdfid_v0_2_1.zip - unzip pdfid_v0_2_1.zip
- pip install -U pip - pip install -U pip
- pip install lxml exifread pillow - pip install lxml exifread pillow
- pip install olefile
- pip install git+https://github.com/decalage2/oletools.git
- pip install git+https://github.com/Rafiot/officedissector.git - pip install git+https://github.com/Rafiot/officedissector.git
- |
if [[ "$TRAVIS_PYTHON_VERSION" == 2* ]]; then
pip install -U oletools olefile
fi
# Module dependencies # Module dependencies
- pip install -r dev-requirements.txt - pip install -r dev-requirements.txt
- pip install coveralls codecov - pip install coveralls codecov

View File

@ -9,8 +9,6 @@ import pytest
from bin.specific import KittenGroomerSpec from bin.specific import KittenGroomerSpec
from bin.pier9 import KittenGroomerPier9 from bin.pier9 import KittenGroomerPier9
from bin.generic import KittenGroomer from bin.generic import KittenGroomer
if sys.version_info.major == 2:
from bin.filecheck import KittenGroomerFileCheck from bin.filecheck import KittenGroomerFileCheck
@ -64,14 +62,12 @@ def test_generic_2(src_complex, dst):
dump_logs(spec) dump_logs(spec)
@py2_only
def test_filecheck(src_complex, dst): def test_filecheck(src_complex, dst):
spec = KittenGroomerFileCheck(src_complex, dst, debug=True) spec = KittenGroomerFileCheck(src_complex, dst, debug=True)
spec.processdir() spec.processdir()
dump_logs(spec) dump_logs(spec)
@py2_only
def test_filecheck_2(src_simple, dst): def test_filecheck_2(src_simple, dst):
spec = KittenGroomerFileCheck(src_simple, dst, debug=True) spec = KittenGroomerFileCheck(src_simple, dst, debug=True)
spec.processdir() spec.processdir()