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

diff --cc src/allmydata/frontends/drop_upload.py
index 7d321130fbee9ef12020041d34b13e21cb6a54f2,dfb4d3023bae90206f69681110da97dfef973202..66bb0a2bc36c77244555c922231501cb034f6745
--- 1/src/allmydata/frontends/drop_upload.py
--- 2/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 eccbd369dce7d35edf5b6e17b3c8d4ff6b36cacf,1b7470d8084ca3dea39f83ccae9290a28af4ac57..85900aeaf3ff57e5bebea456aad6aed8dbc520f3
--- 1/src/allmydata/test/test_drop_upload.py
--- 2/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',