diff --git a/__init__.py b/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/tests/test_examples.py b/tests/test_examples.py index 443537b..79d9efb 100644 --- a/tests/test_examples.py +++ b/tests/test_examples.py @@ -6,12 +6,12 @@ import sys import pytest -from PyCIRCLean.bin.specific import KittenGroomerSpec -from PyCIRCLean.bin.pier9 import KittenGroomerPier9 -from PyCIRCLean.bin.generic import KittenGroomer +from bin.specific import KittenGroomerSpec +from bin.pier9 import KittenGroomerPier9 +from bin.generic import KittenGroomer if sys.version_info.major == 2: - from PyCIRCLean.bin.filecheck import KittenGroomerFileCheck + from bin.filecheck import KittenGroomerFileCheck skip = pytest.mark.skip @@ -52,14 +52,12 @@ def test_pier9(src_complex, dst): dump_logs(spec) -@skip def test_generic(src_simple, dst): spec = KittenGroomer(src_simple, dst, debug=True) spec.processdir() dump_logs(spec) -@skip def test_generic_2(src_complex, dst): spec = KittenGroomer(src_complex, dst, debug=True) spec.processdir() diff --git a/tests/test_integration.py b/tests/test_integration.py index 93488d1..72adafb 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -4,8 +4,7 @@ import os import kittengroomer as kg -from kittengroomer import FileBase -import PyCIRCLean.bin.specific as specific +import bin.specific as specific PATH = os.getcwd() + '/tests/' @@ -17,7 +16,7 @@ def test_base(): def test_help_file(): - f = FileBase('tests/src/blah.conf', 'tests/dst/blah.conf') + f = kg.FileBase('tests/src_complex/blah.conf', 'tests/dst/blah.conf') f.make_unknown() f.make_binary() f.make_unknown()