From 2925bf8cacfd7716639e0177f444140928ed0c9a Mon Sep 17 00:00:00 2001 From: Siddharth Ravikumar Date: Thu, 30 Apr 2015 15:02:36 -0400 Subject: Updated combox.events.NodeDirMonitor.housekeep's delete functionality. - Now the housekeep method deletes the file in the combox directory only if all of its shards are missing in the respective node directories -- meaning it was deleted on another computer (running combox). - If it finds only some of all the shards of a file missing, it stores this information in the `file_deleted' dict inside the silo. - tests.events_tests.TestEvents.test_NDM_housekeep_delete tests the delete functionality of combox.events.NodeDirMonitor.housekeep method. modified: combox/events.py modified: tests/events_test.py --- tests/events_test.py | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/events_test.py b/tests/events_test.py index 5d65709..abb490a 100644 --- a/tests/events_test.py +++ b/tests/events_test.py @@ -35,7 +35,7 @@ from combox.events import ComboxDirMonitor, NodeDirMonitor from combox.file import (relative_path, purge_dir, hash_file, read_file, write_file, move_shards, rm_shards, mk_nodedir, rm_nodedir, - move_nodedir) + move_nodedir, node_paths) from combox.silo import ComboxSilo from tests.utils import (get_config, shardedp, dirp, renamedp, @@ -572,7 +572,34 @@ class TestEvents(object): observers[i].join() - def test_NDM_housekeep(self): + def test_NDM_housekeep_delete(self): + """Testing NodeDirMonitor's housekeep method's delete functionality.""" + # files for testing deletion. + testf1 = path.join(self.FILES_DIR, 'hitchhikers.png') + testf2 = path.join(self.FILES_DIR, 'lorem.housekeep') + copyfile(self.TEST_FILE, testf1) + copyfile(self.lorem, testf2) + + split_and_encrypt(testf2, self.config) + testf2_shard0 = node_paths(testf2, self.config, True)[0] + remove(testf2_shard0) + + silo = ComboxSilo(self.config, self.silo_lock) + silo.update(testf1) + silo.update(testf2) + + ndm = NodeDirMonitor(self.config, self.silo_lock, + self.nodem_lock) + ndm.housekeep() + + assert not path.exists(testf1) + assert path.exists(testf2) + + self.purge_list.append(testf1) + self.purge_list.append(testf2) + + + def untest_NDM_housekeep(self): """Testing NodeDirMonitor's housekeep method.""" # files for testing deletion. -- cgit v1.2.3