From 10ab9e69e4c48640a9bbd9856dfb36c80053c6b5 Mon Sep 17 00:00:00 2001 From: "John M. Horan" Date: Thu, 7 Dec 2017 11:59:55 -0800 Subject: [PATCH 1/2] Increment determine_delta() counter #28 Signed-off-by: John M. Horan --- src/deltacode/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/deltacode/__init__.py b/src/deltacode/__init__.py index 018a8ef9..69b6bddf 100644 --- a/src/deltacode/__init__.py +++ b/src/deltacode/__init__.py @@ -80,13 +80,13 @@ def determine_delta(self): old_index = self.old.index_files() # gathering counts to ensure no files lost or missing from our 'deltas' set - new_files_to_visit = self.new.files_count - old_files_to_visit = self.old.files_count + new_files_visited = 0 + old_files_visited = 0 # perform the deltas for path, new_files in new_index.items(): for new_file in new_files: - new_files_to_visit -= 1 + new_files_visited += 1 if new_file.type != 'file': continue @@ -112,7 +112,7 @@ def determine_delta(self): # now time to find the added. for path, old_files in old_index.items(): for old_file in old_files: - old_files_to_visit -= 1 + old_files_visited += 1 if old_file.type != 'file': continue @@ -125,8 +125,8 @@ def determine_delta(self): continue # make sure everything is accounted for - assert new_files_to_visit == 0 - assert old_files_to_visit == 0 + assert new_files_visited == self.new.files_count + assert old_files_visited == self.old.files_count def get_stats(self): """ From f5a563d1c8f33a0fc2d79f179a08e06be62807e6 Mon Sep 17 00:00:00 2001 From: "John M. Horan" Date: Thu, 7 Dec 2017 12:46:37 -0800 Subject: [PATCH 2/2] Add explanatory messages to assertions #28 Signed-off-by: John M. Horan --- src/deltacode/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/deltacode/__init__.py b/src/deltacode/__init__.py index 69b6bddf..4b044e77 100644 --- a/src/deltacode/__init__.py +++ b/src/deltacode/__init__.py @@ -125,8 +125,8 @@ def determine_delta(self): continue # make sure everything is accounted for - assert new_files_visited == self.new.files_count - assert old_files_visited == self.old.files_count + assert new_files_visited == self.new.files_count, "Number of visited files({})) does not match total_files({}) in the new scan".format(new_files_visited, self.new.files_count) + assert old_files_visited == self.old.files_count, "Number of visited files({})) does not match total_files({}) in the old scan".format(old_files_visited, self.old.files_count) def get_stats(self): """