From: David Stainton Date: Fri, 17 Apr 2015 18:20:03 +0000 (+0100) Subject: Merge branch 'dropupload-scan-on-startup-1458-1' into 2406.otf-objective-2.3.1 X-Git-Url: https://git.rkrishnan.org/pf?a=commitdiff_plain;h=8117a1c4438313818870ce0132e10e37a00e081b;p=tahoe-lafs%2Ftahoe-lafs.git Merge branch 'dropupload-scan-on-startup-1458-1' into 2406.otf-objective-2.3.1 Conflicts: src/allmydata/frontends/drop_upload.py src/allmydata/test/test_drop_upload.py --- 8117a1c4438313818870ce0132e10e37a00e081b diff --cc src/allmydata/frontends/drop_upload.py index 7d321130,dfb4d302..66bb0a2b --- a/src/allmydata/frontends/drop_upload.py +++ b/src/allmydata/frontends/drop_upload.py @@@ -105,7 -96,7 +105,7 @@@ class DropUploader(service.MultiService elif os.path.isfile(childpath) and not os.path.islink(childpath): must_upload = self._check_db_file(childpath) if must_upload: -- self._add_to_dequeue(childpath) ++ self._append_to_deque(self._process, childpath, None) # XXX which event mask? else: if os.path.islink(childpath): self.warn("WARNING: cannot backup symlink %s" % quote_local_unicode_path(childpath)) diff --cc src/allmydata/test/test_drop_upload.py index eccbd369,1b7470d8..85900aea --- a/src/allmydata/test/test_drop_upload.py +++ b/src/allmydata/test/test_drop_upload.py @@@ -185,10 -177,12 +185,8 @@@ class MockTest(DropUploadTestMixin, uni DropUploader, client, upload_dircap, '\xFF', 'magicfolderdb', inotify=fake_inotify) self.shouldFail(AssertionError, 'nonexistent local.directory', 'there is no directory', DropUploader, client, upload_dircap, os.path.join(self.basedir, "Laputa"), 'magicfolderdb', inotify=fake_inotify) -- - fp = filepath.FilePath(self.basedir).child('NOT_A_DIR') - fp.touch() self.shouldFail(AssertionError, 'non-directory local.directory', 'is not a directory', - DropUploader, client, upload_dircap, fp.path, 'magicfolderdb', inotify=fake_inotify) - + DropUploader, client, upload_dircap, not_a_dir, 'magicfolderdb', inotify=fake_inotify) - self.shouldFail(AssertionError, 'bad upload.dircap', 'does not refer to a directory', DropUploader, client, 'bad', errors_dir, 'magicfolderdb', inotify=fake_inotify) self.shouldFail(AssertionError, 'non-directory upload.dircap', 'does not refer to a directory',