diff --git a/MANIFEST.in b/MANIFEST.in index d1bbd43..33d5480 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,9 +4,14 @@ include Makefile include README.md include README.rst include TODO.md +include resiliency_tester_config.txt # Libraries recursive-include lib *.py +recursive-include lib *.pyx # Cython files # Test suite -#recursive-include tests *.py +recursive-include tests *.py +recursive-include tests/files *.* +recursive-include tests/results *.* +include tox.ini diff --git a/_infos.py b/_infos.py index 973236b..aa5d75e 100644 --- a/_infos.py +++ b/_infos.py @@ -4,7 +4,7 @@ __email__ = 'LRQ3000@gmail.com' # Definition of the version number -version_info = 2, 0, 2 # major, minor, patch, extra +version_info = 2, 0, 3 # major, minor, patch, extra # Nice string for the version (mimic how IPython composes its version str) __version__ = '-'.join(map(str, version_info)).replace('-', '.').strip('-') diff --git a/tests/test_aux_funcs.py b/tests/test_aux_funcs.py index d002855..7d97432 100644 --- a/tests/test_aux_funcs.py +++ b/tests/test_aux_funcs.py @@ -2,14 +2,17 @@ from nose.tools import assert_raises -from StringIO import StringIO +import sys import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + +from StringIO import StringIO import shutil from .aux_tests import get_marker, dummy_ecc_file_gen, path_sample_files, create_dir_if_not_exist -from ..lib import aux_funcs as auxf -from ..lib.argparse import ArgumentTypeError +from lib import aux_funcs as auxf +from lib.argparse import ArgumentTypeError def setup_module(): """ Initialize the tests by emptying the out directory """ diff --git a/tests/test_eccman.py b/tests/test_eccman.py index 61cbf1f..aa877bc 100644 --- a/tests/test_eccman.py +++ b/tests/test_eccman.py @@ -2,13 +2,16 @@ from nose.tools import assert_raises +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import shutil -import os, sys from StringIO import StringIO from .aux_tests import get_marker, dummy_ecc_file_gen, check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, remove_if_exist -from ..lib.eccman import ECCMan, compute_ecc_params, detect_reedsolomon_parameters +from lib.eccman import ECCMan, compute_ecc_params, detect_reedsolomon_parameters def setup_module(): """ Initialize the tests by emptying the out directory """ diff --git a/tests/test_hasher.py b/tests/test_hasher.py index 67499db..4ac0c56 100644 --- a/tests/test_hasher.py +++ b/tests/test_hasher.py @@ -2,11 +2,15 @@ from nose.tools import assert_raises +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import shutil from .aux_tests import path_sample_files, create_dir_if_not_exist -from ..lib.hasher import Hasher +from lib.hasher import Hasher def setup_module(): """ Initialize the tests by emptying the out directory """ diff --git a/tests/test_header_ecc.py b/tests/test_header_ecc.py index 58d55f5..6360b35 100644 --- a/tests/test_header_ecc.py +++ b/tests/test_header_ecc.py @@ -1,16 +1,18 @@ from __future__ import print_function +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import itertools import hashlib -import sys - import shutil from StringIO import StringIO -from pyFileFixity import header_ecc as hecc -from ..lib.aux_funcs import get_next_entry -from ..lib.eccman import compute_ecc_params, ECCMan +import header_ecc as hecc +from lib.aux_funcs import get_next_entry +from lib.eccman import compute_ecc_params, ECCMan from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker, dummy_ecc_file_gen def setup_module(): diff --git a/tests/test_repair_ecc.py b/tests/test_repair_ecc.py index 8422c8b..86115ea 100644 --- a/tests/test_repair_ecc.py +++ b/tests/test_repair_ecc.py @@ -1,16 +1,17 @@ from __future__ import print_function -import itertools -import hashlib - import sys import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + +import itertools +import hashlib import shutil -from pyFileFixity import repair_ecc as recc -from pyFileFixity import header_ecc as hecc -from pyFileFixity import structural_adaptive_ecc as saecc +import repair_ecc as recc +import header_ecc as hecc +import structural_adaptive_ecc as saecc from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker def get_db(): diff --git a/tests/test_rfigc.py b/tests/test_rfigc.py index 7c095c3..b8685cd 100644 --- a/tests/test_rfigc.py +++ b/tests/test_rfigc.py @@ -1,14 +1,16 @@ from __future__ import print_function, with_statement +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import itertools import hashlib -import sys -import os import shutil -from .. import rfigc -from ..lib.aux_funcs import recwalk +import rfigc +from lib.aux_funcs import recwalk from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, create_dir_if_not_exist def partial_eq(file, file_partial): diff --git a/tests/test_structural_adaptive_ecc.py b/tests/test_structural_adaptive_ecc.py index f5abe53..ddfc409 100644 --- a/tests/test_structural_adaptive_ecc.py +++ b/tests/test_structural_adaptive_ecc.py @@ -1,15 +1,18 @@ from __future__ import print_function +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import itertools import hashlib -import sys import shutil from StringIO import StringIO -from pyFileFixity import structural_adaptive_ecc as saecc -from pyFileFixity.lib.aux_funcs import get_next_entry -from ..lib.eccman import ECCMan +import structural_adaptive_ecc as saecc +from lib.aux_funcs import get_next_entry +from lib.eccman import ECCMan from .aux_tests import check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, get_marker, dummy_ecc_file_gen def setup_module(): diff --git a/tests/test_tee.py b/tests/test_tee.py index 99e23fe..51cb5ff 100644 --- a/tests/test_tee.py +++ b/tests/test_tee.py @@ -1,12 +1,15 @@ from __future__ import print_function +import sys +import os +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + import shutil -import os, sys from StringIO import StringIO from .aux_tests import get_marker, dummy_ecc_file_gen, check_eq_files, check_eq_dir, path_sample_files, tamper_file, find_next_entry, create_dir_if_not_exist, remove_if_exist -from ..lib.tee import Tee +from lib.tee import Tee def setup_module(): """ Initialize the tests by emptying the out directory """