Skip to content

Commit

Permalink
Fixes tests rudimentary
Browse files Browse the repository at this point in the history
  • Loading branch information
derphilipp committed Jan 4, 2016
1 parent 1ffd12b commit a493440
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
Empty file added __init__.py
Empty file.
2 changes: 1 addition & 1 deletion pwgrep/file_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def file_is_directory(filename):
return os.path.isdir(filename)


def traverse_recursively(directory, deference_recursive=False):
def recurse(directory, deference_recursive=False):
for root, dirs, files in os.walk(directory,
followlinks=deference_recursive):
for filename in files:
Expand Down
10 changes: 4 additions & 6 deletions pwgrep/pwgrep.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@ def progress_files(files, regex, invert_match=False, color=False,
if not (dereference_recursive or recursive):
print('pwgrep: {}: is a directory'.format(file))
else:
for filename in \
file_helper.traverse_recursively(
file,
dereference_recursive):
for filename in file_helper.recurse(file,
dereference_recursive):

if search_in_file(filename, regex,
invert_match,
Expand Down Expand Up @@ -99,10 +97,10 @@ def signal_terminal_handler(signal_nr, frame):
signal.signal(signal.SIGTERM, signal_terminal_handler)

try:
result = main(sys.argv)
any_match = main(sys.argv)
except KeyboardInterrupt:
sys.exit(1)

if result:
if any_match:
sys.exit(0)
sys.exit(1)
Empty file added tests/__init__.py
Empty file.
11 changes: 8 additions & 3 deletions tests/unit_test.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
import pwgrep.file_helper
#!/usr/bin/env python2.7
# -*- coding: utf-8 -*-

from ..pwgrep import file_helper
#import pwgrep
print(__name__)

def test_file_is_binary():
assert pwgrep.file_helper.file_is_binary('data/simple/helloworld') == True
print(__name__)
assert file_helper.file_is_binary('data/simple/helloworld') == True


def test_file_is_text():
assert pwgrep.file_helper.file_is_binary('data/simple/zen_of_python.txt')\
assert file_helper.file_is_binary('data/simple/zen_of_python.txt')\
== False

2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deps =
pytest
setenv =
PYTHONPATH = {toxinidir}
commands =
commands =
py.test {posargs}

[testenv:coverage]
Expand Down

0 comments on commit a493440

Please sign in to comment.