summaryrefslogtreecommitdiffstats
path: root/tests/file_test.py
diff options
context:
space:
mode:
authorSiddharth Ravikumar <sravik@bgsu.edu>2015-02-26 02:38:52 -0500
committerSiddharth Ravikumar <sravik@bgsu.edu>2015-02-26 02:38:52 -0500
commit6eb0555742dc1b7290c55a17b02ff108ae03591d (patch)
tree03999491d0b10723f2962833c935c9d45a815ef0 /tests/file_test.py
parentec1b156cd7926e5845c8b6b16762e5fc57ea3a8b (diff)
modded combox.file.hash_file function -- added new arg `file_content'
- `file_content' is set to None by default - If `file_content' is not None, hash of this is returned. Updated the test for hash_file function. modified: combox/file.py modified: tests/file_test.py
Diffstat (limited to 'tests/file_test.py')
-rw-r--r--tests/file_test.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/file_test.py b/tests/file_test.py
index 807ed23..7c041b7 100644
--- a/tests/file_test.py
+++ b/tests/file_test.py
@@ -88,10 +88,12 @@ class TestFile(object):
"""
Tests the hashing function - hash_file
"""
- fhash = hash_file(self.TEST_FILE)
fcontent = read_file(self.TEST_FILE)
+ fhash_0 = hash_file(self.TEST_FILE)
+ fhash_1 = hash_file(self.TEST_FILE, fcontent)
- assert fhash == sha512(fcontent).hexdigest()
+ assert fhash_0 == sha512(fcontent).hexdigest()
+ assert fhash_1 == sha512(fcontent).hexdigest()
def test_relativepath(self):