From 3a49eb7364280e234154582fe780aea6cd996b0a Mon Sep 17 00:00:00 2001
From: Jacob Bachmeyer <jcb@gnu.org>
Date: Tue, 22 Nov 2022 21:31:00 -0600
Subject: [PATCH] Rename "incoming" directory to "inbox" directory

---
 gatekeeper.pl                           |  7 ++-
 testsuite/gatekeeper.all/00_idle.exp    | 48 +++++++--------
 testsuite/gatekeeper.all/01_loose.exp   | 76 ++++++++++++------------
 testsuite/gatekeeper.all/03_triplet.exp | 78 ++++++++++++-------------
 testsuite/gatekeeper.all/11_am_cve.exp  |  2 +-
 testsuite/gatekeeper.all/11_email.exp   |  2 +-
 testsuite/gatekeeper.all/11_ratchet.exp | 14 ++---
 testsuite/lib/gatekeeper.exp            | 16 ++---
 8 files changed, 122 insertions(+), 121 deletions(-)

diff --git a/gatekeeper.pl b/gatekeeper.pl
index c9ded32..43fee03 100755
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -346,7 +346,7 @@ if (IN_TEST_MODE) {	# override the above for testing
 
     $package_config_base =	File::Spec->catdir($base, 'packages');
 
-    our $Inbox_dir	=	File::Spec->catdir($base, 'incoming');
+    our $Inbox_dir	=	File::Spec->catdir($base, 'inbox');
     our $Scratch_dir	=	File::Spec->catdir($base, 'in-stage');
     our $Stage_dir	=	File::Spec->catdir($base, 'stage');
     our $Public_dir	=	File::Spec->catdir($base, 'pub');
@@ -1383,7 +1383,7 @@ sub gather_packets {
       my $triplet = [$stem.'.directive.asc', $stem.'.sig', $stem];
 
       foreach my $file (@$triplet) {
-	# If the file exists in the scratchpad, but not in the incoming
+	# If the file exists in the scratchpad, but not in the inbox
 	# directory, we may have already moved it to the scratchpad
 	# directory as part of another packet.  We submit both packets for
 	# processing; it is near-certain that one of them is fake and will
@@ -2963,7 +2963,8 @@ if ((scalar @packets) == 0) {
 {
   our $Inbox_dir; our $Scratch_dir;
 
-  # Clean up the incoming directory and the incoming tmp directory - remove files older than a day
+  # Clean up the inbox directory and the scratch directory by removing
+  # files older than a day
   cleanup_dir($Inbox_dir);
   cleanup_dir($Scratch_dir);
 }
diff --git a/testsuite/gatekeeper.all/00_idle.exp b/testsuite/gatekeeper.all/00_idle.exp
index c9d0e49..28493c2 100644
--- a/testsuite/gatekeeper.all/00_idle.exp
+++ b/testsuite/gatekeeper.all/00_idle.exp
@@ -24,7 +24,7 @@ run_upload_batch_test
 stop_test_services
 
 analyze_file_tree $tenv "idle processing: no files" {
-    incoming in-stage stage pub archive
+    inbox in-stage stage pub archive
 } empty
 
 analyze_log $tenv "idle processing: no files" {
@@ -41,27 +41,27 @@ close_test_environment $tenv
 set tenv [new_test_environment]
 
 # files which are to be found in the scan but not processed
-put_file [file join $tenv incoming bogus1] "bogus file 1\n"
-put_file [file join $tenv incoming bogus2] "bogus file 2\n"
-put_file [file join $tenv incoming bogus3] "bogus file 3\n"
+put_file [file join $tenv inbox bogus1] "bogus file 1\n"
+put_file [file join $tenv inbox bogus2] "bogus file 2\n"
+put_file [file join $tenv inbox bogus3] "bogus file 3\n"
 
-age_file [file join $tenv incoming bogus1] "3 minutes ago"
-age_file [file join $tenv incoming bogus2] "2 minutes 15 seconds ago"
-age_file [file join $tenv incoming bogus3] "1 minute  ago"
+age_file [file join $tenv inbox bogus1] "3 minutes ago"
+age_file [file join $tenv inbox bogus2] "2 minutes 15 seconds ago"
+age_file [file join $tenv inbox bogus3] "1 minute  ago"
 
 foreach file {
     bo_gus bo+gus bo-gus bo~gus bo.gus
 } {
-    put_file [file join $tenv incoming ${file}] "bogus file $file\n"
-    age_file [file join $tenv incoming ${file}] "3 minutes ago"
+    put_file [file join $tenv inbox ${file}] "bogus file $file\n"
+    age_file [file join $tenv inbox ${file}] "3 minutes ago"
 }
 
 # files which are to be rejected, ignored, and removed
 foreach file {
     x=x .abcfoobar ..abcfoobar -abcfoobar x;x \\~xax x*x x:x x?x ;xax _x +x
 } {
-    put_file [file join $tenv incoming ${file}] "bogus input $file\n"
-    age_file [file join $tenv incoming ${file}] "3 minutes ago"
+    put_file [file join $tenv inbox ${file}] "bogus input $file\n"
+    age_file [file join $tenv inbox ${file}] "3 minutes ago"
 }
 # ... except for .abcfoobar, which cleanup would produce when removing a
 #     file named "abcfoobar", which is an acceptable name
@@ -71,7 +71,7 @@ run_upload_batch_test
 stop_test_services
 
 analyze_file_tree $tenv "idle processing: bogus files" {
-    incoming
+    inbox
 } files {
     bogus1 bogus2 bogus3 .abcfoobar
     bo_gus bo+gus bo-gus bo~gus bo.gus
@@ -165,7 +165,7 @@ proc check_incomplete_upload { has_directive has_main has_signature } {
 		\[${has_directive}${has_main}${has_signature}\]"
 
     analyze_file_tree $tenv $Name {
-	incoming
+	inbox
     } files $filelist
     analyze_file_tree $tenv $Name {
 	in-stage stage pub archive
@@ -199,7 +199,7 @@ proc check_ongoing_upload { open_directive open_main open_signature } {
 
     set mockfile [open [file join $tenv mocks] w]
     puts $mockfile {:^ lsof -Fn .*}
-    set lsofstem [file normalize [file join $tenv incoming]]
+    set lsofstem [file normalize [file join $tenv inbox]]
     if { $open_directive } {
 	puts $mockfile "> n${lsofstem}/partial.bin.directive.asc"
 	lappend msglist \
@@ -243,7 +243,7 @@ proc check_ongoing_upload { open_directive open_main open_signature } {
 		\[${open_directive}${open_main}${open_signature}\]"
 
     analyze_file_tree $tenv $Name {
-	incoming
+	inbox
     } files {
 	partial.bin partial.bin.sig partial.bin.directive.asc
     }
@@ -314,7 +314,7 @@ proc check_recent_upload { recent_directive recent_main recent_signature } {
 		\[${recent_directive}${recent_main}${recent_signature}\]"
 
     analyze_file_tree $tenv $Name {
-	incoming
+	inbox
     } files { recent.bin recent.bin.sig recent.bin.directive.asc }
     analyze_file_tree $tenv $Name {
 	in-stage stage pub archive
@@ -358,11 +358,11 @@ proc check_oversize_part { oversize_directive oversize_signature } {
 	}
     }
     if { $oversize_directive } {
-	set chan [open [file join $tenv incoming oversize.bin.directive.asc] a]
+	set chan [open [file join $tenv inbox oversize.bin.directive.asc] a]
 	puts $chan [string repeat \
 			"[string repeat { bogon } 11]\n" 1024]
 	close $chan
-	age_file [file join $tenv incoming oversize.bin.directive.asc] \
+	age_file [file join $tenv inbox oversize.bin.directive.asc] \
 	    "3 minutes ago"
 	lappend msglist oversize-directive,oversize.bin.directive.asc \
 	    "detected oversize directive file"
@@ -372,11 +372,11 @@ proc check_oversize_part { oversize_directive oversize_signature } {
 	    "scan found directive file"
     }
     if { $oversize_signature } {
-	set chan [open [file join $tenv incoming oversize.bin.sig] a]
+	set chan [open [file join $tenv inbox oversize.bin.sig] a]
 	puts $chan [string repeat \
 			"[string repeat { bogon } 11]\n" 1024]
 	close $chan
-	age_file [file join $tenv incoming oversize.bin.sig] \
+	age_file [file join $tenv inbox oversize.bin.sig] \
 	    "3 minutes ago"
 	lappend msglist oversize-signature,oversize.bin.sig \
 	    "detected oversize signature file"
@@ -393,7 +393,7 @@ proc check_oversize_part { oversize_directive oversize_signature } {
 		\[${oversize_directive}${oversize_signature}\]"
 
     analyze_file_tree $tenv $Name {
-	incoming
+	inbox
     } files $filelist
     analyze_file_tree $tenv $Name {
 	in-stage stage pub archive
@@ -414,8 +414,8 @@ proc check_cleanup { which } {
     set tenv [new_test_environment]
 
     switch -- $which {
-	incoming	{ set other in-stage }
-	in-stage	{ set other incoming }
+	inbox		{ set other in-stage }
+	in-stage	{ set other inbox }
     }
 
     set test_file	[file join $tenv $which  test-old-file]
@@ -477,7 +477,7 @@ proc check_cleanup { which } {
     close_test_environment $tenv
 }
 
-check_cleanup incoming
+check_cleanup inbox
 check_cleanup in-stage
 
 # ----------------------------------------
diff --git a/testsuite/gatekeeper.all/01_loose.exp b/testsuite/gatekeeper.all/01_loose.exp
index 3f830e8..9e41b00 100644
--- a/testsuite/gatekeeper.all/01_loose.exp
+++ b/testsuite/gatekeeper.all/01_loose.exp
@@ -102,7 +102,7 @@ check_loose_directive "bogus: unsigned with no directory specified" {
 	comment "do nothing"
     }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
@@ -118,7 +118,7 @@ check_loose_directive "bogus: unsigned for bogus package" {
 	comment "do nothing"
     }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
@@ -134,7 +134,7 @@ check_loose_directive "bogus: unsigned for package with no email address" {
 	comment "do nothing"
     }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
@@ -150,7 +150,7 @@ check_loose_directive "bogus: unsigned for valid package" {
 	comment "do nothing"
     }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
@@ -165,7 +165,7 @@ check_loose_directive "bogus: signed with no directory specified" {
 	comment "do nothing"
     } dsig { good 00 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,no-directory-given "directive rejected: no directory specified"
@@ -182,7 +182,7 @@ check_loose_directive "bogus: signed with wrong key" {
 	comment "do nothing"
     } dsig { good 01 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     gpgv,directive-verify-failed "incorrect signature rejected"
@@ -200,7 +200,7 @@ check_loose_directive "bogus: signed with wrong key and directory repeated" {
 	comment "do nothing"
     } dsig { good 01 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,bad-directory-repeat "duplicate directory rejected"
@@ -218,7 +218,7 @@ check_loose_directive "bogus: signed with wrong key and directory ambiguous" {
 	comment "do nothing"
     } dsig { good 01 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,bad-directory-repeat "ambiguous directory rejected"
@@ -235,7 +235,7 @@ check_loose_directive "bogus: signed with wrong key and too deep" {
 	comment "do nothing"
     } dsig { good 01 1001 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,bad-directory-depth "excessively deep directory rejected"
@@ -251,7 +251,7 @@ check_loose_directive "bogus: signed for bogus package" {
 	comment "do nothing"
     } dsig { good 02 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     unknown-package "unknown package from directive"
@@ -268,7 +268,7 @@ check_loose_directive "bogus: signed for package with no email address" {
 	comment "do nothing"
     } dsig { good 03 1001 }
 } file-tree {
-    { incoming in-stage stage pub archive } empty {}
+    { inbox in-stage stage pub archive } empty {}
 } email-to {
     ftp-upload-script@gnu.org ftp-upload-report@gnu.org
 }
@@ -280,7 +280,7 @@ check_loose_directive "bogus: no actual command" {
 	comment "no actual command here"
     } dsig { good 04 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,no-op "null directive rejected"
@@ -297,7 +297,7 @@ check_loose_directive "bogus: set 'replace' but no actual command" {
 	comment "replace does not count as a command"
     } dsig { good 05 1000 }
 } file-tree {
-    { incoming stage pub archive } empty {}
+    { inbox stage pub archive } empty {}
     { in-stage } files { .foo.directive.asc }
 } log {
     validate,no-op "null directive rejected"
@@ -317,7 +317,7 @@ check_loose_directive "create symlink" {
 } initial-files {
     pub { foo/foo-1.2.bin { good 06 1000 } }
 } file-tree {
-    { incoming in-stage stage archive } empty {}
+    { inbox in-stage stage archive } empty {}
     { pub } files { foo/foo-1.2.bin foo/foo-latest.bin }
     { pub } symlink-targets { foo-1.2.bin foo/foo-latest.bin }
 } log {
@@ -336,7 +336,7 @@ check_loose_directive "create dangling symlink" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming in-stage stage archive } empty {}
+    { inbox in-stage stage archive } empty {}
     { pub } files { foo/foo-1.0.bin foo/foo-latest.bin }
     { pub } symlink-targets { foo-1.2.bin foo/foo-latest.bin }
 } log {
@@ -358,7 +358,7 @@ check_loose_directive "error: create symlink using /../ in name" {
 	foo/bar/README { good 10 1000 }
     }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/bar/README }
 } log {
@@ -378,7 +378,7 @@ check_loose_directive "error: create symlink using /../ in target" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -398,7 +398,7 @@ check_loose_directive "error: create symlink with bogus name" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -417,7 +417,7 @@ check_loose_directive "error: create symlink with bogus target" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -436,7 +436,7 @@ check_loose_directive "error: create symlink with absolute name" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -455,7 +455,7 @@ check_loose_directive "error: create symlink with absolute target" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -474,7 +474,7 @@ check_loose_directive "error: create symlink with only one parameter" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -493,7 +493,7 @@ check_loose_directive "error: create symlink with too many parameters" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -517,7 +517,7 @@ check_loose_directive "replace symlink" {
 } initial-symlinks {
     pub { foo-1.0.bin foo/foo-latest.bin }
 } file-tree {
-    { incoming in-stage stage archive } empty {}
+    { inbox in-stage stage archive } empty {}
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin foo/foo-latest.bin }
     { pub } symlink-targets { foo-1.2.bin foo/foo-latest.bin }
 } log {
@@ -538,7 +538,7 @@ check_loose_directive "remove symlink" {
 } initial-symlinks {
     pub { foo-1.2.bin foo/foo-latest.bin }
 } file-tree {
-    { incoming in-stage stage archive } empty {}
+    { inbox in-stage stage archive } empty {}
     { pub } files { foo/foo-1.2.bin }
 } log {
     action,rm-symlink "recorded removal of symlink"
@@ -558,7 +558,7 @@ check_loose_directive "error: remove symlink using /../" {
 } initial-symlinks {
     pub { foo-1.2.bin foo/foo-latest.bin }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.2.bin foo/foo-latest.bin }
     { pub } symlink-targets { foo-1.2.bin foo/foo-latest.bin }
@@ -579,7 +579,7 @@ check_loose_directive "error: remove symlink with bogus name" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -601,7 +601,7 @@ check_loose_directive "error: remove symlink with absolute name" {
 } initial-symlinks {
     pub { foo-1.0.bin foo/foo-latest.bin }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-latest.bin }
     { pub } symlink-targets { foo-1.0.bin foo/foo-latest.bin }
@@ -622,7 +622,7 @@ check_loose_directive "error: remove symlink with too many parameters" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -642,7 +642,7 @@ check_loose_directive "error: remove non-existent symlink" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -662,7 +662,7 @@ check_loose_directive "error: remove file as if symlink" {
 } initial-files {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
@@ -685,7 +685,7 @@ check_loose_directive "error: replace file with symlink" {
 	foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
@@ -708,7 +708,7 @@ check_loose_directive "archive file" {
 	foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { incoming in-stage stage } empty {}
+    { inbox in-stage stage } empty {}
     { pub } files { foo/foo-1.2.bin }
     { archive } archived-files { foo/foo-1.0.bin }
 } log {
@@ -732,7 +732,7 @@ check_loose_directive "archive directory" {
 	foo/bar/bar-2.bin { good 08 1000 }
     }
 } file-tree {
-    { incoming in-stage stage } empty {}
+    { inbox in-stage stage } empty {}
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
     { archive } archived-files { foo/bar/bar-1.bin foo/bar/bar-2.bin }
 } log {
@@ -759,7 +759,7 @@ check_loose_directive "archive symlink" {
 	foo-1.2.bin.sig	foo/foo-latest.bin.sig
     }
 } file-tree {
-    { incoming in-stage stage } empty {}
+    { inbox in-stage stage } empty {}
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
     { archive } archived-files { foo/foo-latest.bin }
 } log {
@@ -780,7 +780,7 @@ check_loose_directive "error: archive non-existent file" {
 	foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.2.bin }
 } log {
@@ -802,7 +802,7 @@ check_loose_directive "error: archive bogus name" {
 	foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
@@ -825,7 +825,7 @@ check_loose_directive "error: archive name using /../" {
 	foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { incoming stage archive } empty {}
+    { inbox stage archive } empty {}
     { in-stage } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
diff --git a/testsuite/gatekeeper.all/03_triplet.exp b/testsuite/gatekeeper.all/03_triplet.exp
index e68b3c6..815a82c 100644
--- a/testsuite/gatekeeper.all/03_triplet.exp
+++ b/testsuite/gatekeeper.all/03_triplet.exp
@@ -104,7 +104,7 @@ check_triplet "bogus: signature from unknown key in directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
 	}
@@ -140,7 +140,7 @@ check_triplet "bogus: signature from unknown key on file" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
 	}
@@ -179,7 +179,7 @@ check_triplet "bogus: bad signature in directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
 	}
@@ -215,7 +215,7 @@ check_triplet "bogus: bad signature on file" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
 	}
@@ -247,7 +247,7 @@ check_triplet "bogus: empty directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin .foo.bin.sig .foo.bin.directive.asc
 	}
@@ -280,7 +280,7 @@ check_triplet "bogus: directive with unknown key" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin .foo.bin.sig .foo.bin.directive.asc
 	}
@@ -317,7 +317,7 @@ check_triplet "bogus: signed for unknown package" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -358,7 +358,7 @@ check_triplet "bogus: signed but package has no keys" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -403,7 +403,7 @@ check_triplet "bogus: signed but package has no email addresses" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -439,7 +439,7 @@ check_triplet "bogus: directive signature from the future" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -474,7 +474,7 @@ check_triplet "bogus: file signature from the future" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -517,7 +517,7 @@ check_triplet "bogus: signed with wrong key" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -559,7 +559,7 @@ check_triplet "bogus: signed with wrong key in directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -602,7 +602,7 @@ check_triplet "bogus: signed with wrong key on file" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
 	}
@@ -648,7 +648,7 @@ check_triplet "bogus: version field not a number" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -682,7 +682,7 @@ check_triplet "bogus: invalid v1.0 format directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -714,7 +714,7 @@ check_triplet "obsolete: v1.0 format directive" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -749,7 +749,7 @@ check_triplet "bogus: duplicated version key" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -784,7 +784,7 @@ check_triplet "bogus: ambiguous version declaration" setup {
     }
 } check {
     file-tree {
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -821,7 +821,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -855,7 +855,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -891,7 +891,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -927,7 +927,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -962,7 +962,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -996,7 +996,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -1030,7 +1030,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -1074,7 +1074,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 		}
 	    }] check [subst {
 		file-tree {
-		    { incoming stage pub archive } empty {}
+		    { inbox stage pub archive } empty {}
 		    { in-stage } files {
 			.foo.bin.directive.asc .foo.bin.sig .foo.bin
 		    }
@@ -1110,7 +1110,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	    }
 	}] check {
 	    file-tree {
-		{ incoming stage pub archive } empty {}
+		{ inbox stage pub archive } empty {}
 		{ in-stage } files {
 		    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 		}
@@ -1146,7 +1146,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	    }
 	}] check {
 	    file-tree {
-		{ incoming stage pub archive } empty {}
+		{ inbox stage pub archive } empty {}
 		{ in-stage } files {
 		    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 		}
@@ -1183,7 +1183,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	    }
 	}] check {
 	    file-tree {
-		{ incoming stage pub archive } empty {}
+		{ inbox stage pub archive } empty {}
 		{ in-stage } files {
 		    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 		}
@@ -1227,7 +1227,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check [subst {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/v$FVER/foo.bin.sig foo/v$FVER/foo.bin
 	    }
@@ -1264,7 +1264,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check [subst {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/bar/v$FVER/foo.bin.sig foo/bar/v$FVER/foo.bin
 	    }
@@ -1301,7 +1301,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check [subst {
 	file-tree {
-	    { incoming stage pub archive } empty {}
+	    { inbox stage pub archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -1338,7 +1338,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check [subst {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/bar/v$FVER/foo.bin.sig foo/bar/v$FVER/foo.bin
 	    }
@@ -1377,7 +1377,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage archive } empty {}
+	    { inbox stage archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -1420,7 +1420,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
 	}
     }] check {
 	file-tree {
-	    { incoming stage archive } empty {}
+	    { inbox stage archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -1464,7 +1464,7 @@ check_triplet "bogus: v1.1 format directive to replace file" setup {
     }
 } check {
     file-tree {
-	{ incoming stage archive } empty {}
+	{ inbox stage archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
@@ -1506,7 +1506,7 @@ check_triplet "v1.2 format directive to replace file" setup {
     }
 } check {
     file-tree {
-	{ incoming in-stage stage } empty {}
+	{ inbox in-stage stage } empty {}
 	{ pub } files {
 	    foo/foo.bin foo/foo.bin.sig
 	}
@@ -1545,7 +1545,7 @@ check_triplet "bogus: v1.2 format directive with bogus replace value" setup {
     }
 } check {
     file-tree {
-	{ incoming stage archive } empty {}
+	{ inbox stage archive } empty {}
 	{ in-stage } files {
 	    .foo.bin.directive.asc .foo.bin.sig .foo.bin
 	}
diff --git a/testsuite/gatekeeper.all/11_am_cve.exp b/testsuite/gatekeeper.all/11_am_cve.exp
index e70317a..efe8646 100644
--- a/testsuite/gatekeeper.all/11_am_cve.exp
+++ b/testsuite/gatekeeper.all/11_am_cve.exp
@@ -68,7 +68,7 @@ proc check_am_cve_upload {desc fragment {log {}}} {
 	ftp-upload-report@gnu.org foo@example.org foo@example.net
     }
     analyze_file_tree $tenv "am_cve: $desc" \
-	{ incoming stage pub archive } empty {}
+	{ inbox stage pub archive } empty {}
     analyze_file_tree $tenv "am_cve: $desc" \
 	{ in-stage } files {
 	    .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
diff --git a/testsuite/gatekeeper.all/11_email.exp b/testsuite/gatekeeper.all/11_email.exp
index e24e2b4..5722f33 100644
--- a/testsuite/gatekeeper.all/11_email.exp
+++ b/testsuite/gatekeeper.all/11_email.exp
@@ -54,7 +54,7 @@ proc check_email_handling {desc args} {
     analyze_mail $tenv "email: $desc" to $data(email-to)
 
     analyze_file_tree $tenv "email: $desc" \
-	{ incoming in-stage stage archive } empty {}
+	{ inbox in-stage stage archive } empty {}
     analyze_file_tree $tenv "email: $desc" \
 	{ pub } files { foo/foo.bin.sig foo/foo.bin }
 
diff --git a/testsuite/gatekeeper.all/11_ratchet.exp b/testsuite/gatekeeper.all/11_ratchet.exp
index b56ac5b..a2ef1aa 100644
--- a/testsuite/gatekeeper.all/11_ratchet.exp
+++ b/testsuite/gatekeeper.all/11_ratchet.exp
@@ -109,7 +109,7 @@ check_ratchet_handling "simple replay of new upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/foo.bin.sig foo/foo.bin
 	    }
@@ -135,7 +135,7 @@ check_ratchet_handling "simple replay of new upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming stage archive } empty {}
+	    { inbox stage archive } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
@@ -174,7 +174,7 @@ check_ratchet_handling "replace new upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/foo.bin.sig foo/foo.bin
 	    }
@@ -200,7 +200,7 @@ check_ratchet_handling "replace new upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming in-stage stage } empty {}
+	    { inbox in-stage stage } empty {}
 	    { archive } archived-files {
 		foo/foo.bin
 	    }
@@ -240,7 +240,7 @@ check_ratchet_handling "replay replaced upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming in-stage stage archive } empty {}
+	    { inbox in-stage stage archive } empty {}
 	    { pub } files {
 		foo/foo.bin.sig foo/foo.bin
 	    }
@@ -266,7 +266,7 @@ check_ratchet_handling "replay replaced upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming in-stage stage } empty {}
+	    { inbox in-stage stage } empty {}
 	    { archive } archived-files {
 		foo/foo.bin
 	    }
@@ -295,7 +295,7 @@ check_ratchet_handling "replay replaced upload" setup {
 	}
     } check {
 	file-tree {
-	    { incoming stage } empty {}
+	    { inbox stage } empty {}
 	    { in-stage } files {
 		.foo.bin.directive.asc .foo.bin.sig .foo.bin
 	    }
diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 6c1f348..1cad536 100644
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -84,7 +84,7 @@ proc close_test_environment { name } {
 proc make_test_environment { base_dir } {
     file mkdir $base_dir
     file mkdir [file join $base_dir packages]
-    file mkdir [file join $base_dir incoming]
+    file mkdir [file join $base_dir inbox]
     file mkdir [file join $base_dir in-stage]
     file mkdir [file join $base_dir stage]
     file mkdir [file join $base_dir pub]
@@ -191,24 +191,24 @@ proc make_test_case { base_dir packlist } {
 		    [sign_test_message $directive \
 			 [eval make_test_signature $parts(dsig)]]
 	    }
-	    put_file [file join $base_dir incoming "${stem}.directive.asc"] \
+	    put_file [file join $base_dir inbox "${stem}.directive.asc"] \
 		$directive
-	    age_file [file join $base_dir incoming "${stem}.directive.asc"] \
+	    age_file [file join $base_dir inbox "${stem}.directive.asc"] \
 		$parts(directive-mtime)
 	}
 
 	if { [info exists parts(fsig)] } {	# write detached signature
-	    put_file [file join $base_dir incoming "${stem}.sig"] \
+	    put_file [file join $base_dir inbox "${stem}.sig"] \
 		[sign_test_file $stem \
 		     [eval make_test_signature $parts(fsig)]]
-	    age_file [file join $base_dir incoming "${stem}.sig"] \
+	    age_file [file join $base_dir inbox "${stem}.sig"] \
 		$parts(fsig-mtime)
 	}
 
 	if { [info exists parts(file)] } {	# write file
-	    put_file [file join $base_dir incoming "${stem}"] \
+	    put_file [file join $base_dir inbox "${stem}"] \
 		[string trimleft $parts(file)]
-	    age_file [file join $base_dir incoming "${stem}"] \
+	    age_file [file join $base_dir inbox "${stem}"] \
 		$parts(file-mtime)
 	}
 
@@ -219,7 +219,7 @@ proc make_test_case { base_dir packlist } {
 	    regexp -indices {[.]tar(?:[.]|$)} $stem metastem_offsets
 	    set metastem [string range $stem \
 			      0 [expr {[lindex $metastem_offsets 0] - 1}]]
-	    set tar_file [file join $base_dir incoming "${metastem}.tar"]
+	    set tar_file [file join $base_dir inbox "${metastem}.tar"]
 	    set tar_base [new_work_area [file join $base_dir tarpad]]
 	    file mkdir [file join $tar_base $metastem]
 	    foreach { name contents } $parts(tar-file) {
-- 
2.25.1