CIRCL
/
PyCIRCLean
mirror of https://github.com/CIRCL/PyCIRCLean
2
0
Fork 0
Code Issues Releases Wiki Activity

Removed __init__ from . and changed imports in tests 

Python import system can be tricky, but I think that not having __init__ in
the main directory here is better. We'll have to make sure it doesn't break
anything.
pull/6/head
Dan Puttick 2016-12-07 11:31:28 -05:00
parent 91e6b85319
commit dc9c864e23
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
__init__.py
View File

10
tests/test_examples.py
View File

@ -6,12 +6,12 @@ import sys
import pytest import pytest
from PyCIRCLean.bin.specific import KittenGroomerSpec from bin.specific import KittenGroomerSpec
from PyCIRCLean.bin.pier9 import KittenGroomerPier9 from bin.pier9 import KittenGroomerPier9
from PyCIRCLean.bin.generic import KittenGroomer from bin.generic import KittenGroomer
if sys.version_info.major == 2: if sys.version_info.major == 2:
from PyCIRCLean.bin.filecheck import KittenGroomerFileCheck from bin.filecheck import KittenGroomerFileCheck
skip = pytest.mark.skip skip = pytest.mark.skip
@ -52,14 +52,12 @@ def test_pier9(src_complex, dst):
dump_logs(spec) dump_logs(spec)
@skip
def test_generic(src_simple, dst): def test_generic(src_simple, dst):
spec = KittenGroomer(src_simple, dst, debug=True) spec = KittenGroomer(src_simple, dst, debug=True)
spec.processdir() spec.processdir()
dump_logs(spec) dump_logs(spec)
@skip
def test_generic_2(src_complex, dst): def test_generic_2(src_complex, dst):
spec = KittenGroomer(src_complex, dst, debug=True) spec = KittenGroomer(src_complex, dst, debug=True)
spec.processdir() spec.processdir()

5
tests/test_integration.py
View File

@ -4,8 +4,7 @@
import os import os
import kittengroomer as kg import kittengroomer as kg
from kittengroomer import FileBase import bin.specific as specific
import PyCIRCLean.bin.specific as specific
PATH = os.getcwd() + '/tests/' PATH = os.getcwd() + '/tests/'
@ -17,7 +16,7 @@ def test_base():
def test_help_file(): 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_unknown()
f.make_binary() f.make_binary()
f.make_unknown() f.make_unknown()