Rename "in-stage" directory to "scratch" directory

diff --git a/gatekeeper.pl b/gatekeeper.pl
index 43fee03a3b08ed3d4855b54a9bca5b798a406c17..81a6e1be29c3fe75d0821674fc74e41b132e5f64 100755 (executable)
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -347,7 +347,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, 'inbox');
-    our $Scratch_dir   =       File::Spec->catdir($base, 'in-stage');
+    our $Scratch_dir   =       File::Spec->catdir($base, 'scratch');
     our $Stage_dir     =       File::Spec->catdir($base, 'stage');
     our $Public_dir    =       File::Spec->catdir($base, 'pub');
     our $Archive_dir   =       File::Spec->catdir($base, 'archive');

diff --git a/testsuite/gatekeeper.all/00_idle.exp b/testsuite/gatekeeper.all/00_idle.exp
index 28493c28996964785e08e56bcee22172d7487c4e..fd56888799db3bcf224a57a0a4b22b87b9d2671f 100644 (file)
--- 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" {
-    inbox in-stage stage pub archive
+    inbox scratch stage pub archive
 } empty
 
 analyze_log $tenv "idle processing: no files" {
@@ -77,7 +77,7 @@ analyze_file_tree $tenv "idle processing: bogus files" {
     bo_gus bo+gus bo-gus bo~gus bo.gus
 }
 analyze_file_tree $tenv "idle processing: bogus files" {
-    in-stage stage pub archive
+    scratch stage pub archive
 } empty
 
 analyze_log $tenv "idle processing: bogus files" {
@@ -168,7 +168,7 @@ proc check_incomplete_upload { has_directive has_main has_signature } {
        inbox
     } files $filelist
     analyze_file_tree $tenv $Name {
-       in-stage stage pub archive
+       scratch stage pub archive
     } empty
     analyze_log $tenv $Name $msglist
     analyze_no_mail $tenv $Name
@@ -248,7 +248,7 @@ proc check_ongoing_upload { open_directive open_main open_signature } {
        partial.bin partial.bin.sig partial.bin.directive.asc
     }
     analyze_file_tree $tenv $Name {
-       in-stage stage pub archive
+       scratch stage pub archive
     } empty
     analyze_log $tenv $Name $msglist
     analyze_no_mail $tenv $Name
@@ -317,7 +317,7 @@ proc check_recent_upload { recent_directive recent_main recent_signature } {
        inbox
     } files { recent.bin recent.bin.sig recent.bin.directive.asc }
     analyze_file_tree $tenv $Name {
-       in-stage stage pub archive
+       scratch stage pub archive
     } empty
     analyze_log $tenv $Name $msglist
     analyze_no_mail $tenv $Name
@@ -396,7 +396,7 @@ proc check_oversize_part { oversize_directive oversize_signature } {
        inbox
     } files $filelist
     analyze_file_tree $tenv $Name {
-       in-stage stage pub archive
+       scratch stage pub archive
     } empty
     analyze_log $tenv $Name $msglist
     analyze_no_mail $tenv $Name
@@ -414,8 +414,8 @@ proc check_cleanup { which } {
     set tenv [new_test_environment]
 
     switch -- $which {
-       inbox           { set other in-stage }
-       in-stage        { set other inbox }
+       inbox           { set other scratch }
+       scratch { set other inbox }
     }
 
     set test_file      [file join $tenv $which  test-old-file]
@@ -478,7 +478,7 @@ proc check_cleanup { which } {
 }
 
 check_cleanup inbox
-check_cleanup in-stage
+check_cleanup scratch
 
 # ----------------------------------------
 

diff --git a/testsuite/gatekeeper.all/01_loose.exp b/testsuite/gatekeeper.all/01_loose.exp
index 9e41b001898c0137a6bc6a7ef8c7bdb64298774b..26d1c38c9545646d2bc31a4aa32390fe7a0f7823 100644 (file)
--- a/testsuite/gatekeeper.all/01_loose.exp
+++ b/testsuite/gatekeeper.all/01_loose.exp
@@ -103,7 +103,7 @@ check_loose_directive "bogus: unsigned with no directory specified" {
     }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
 } email-to {
@@ -119,7 +119,7 @@ check_loose_directive "bogus: unsigned for bogus package" {
     }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
 } email-to {
@@ -135,7 +135,7 @@ check_loose_directive "bogus: unsigned for package with no email address" {
     }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
 } email-to {
@@ -151,7 +151,7 @@ check_loose_directive "bogus: unsigned for valid package" {
     }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     unsigned-directive,foo.directive.asc "unsigned directive"
 } email-to {
@@ -166,7 +166,7 @@ check_loose_directive "bogus: signed with no directory specified" {
     } dsig { good 00 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,no-directory-given "directive rejected: no directory specified"
 } email-to {
@@ -183,7 +183,7 @@ check_loose_directive "bogus: signed with wrong key" {
     } dsig { good 01 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     gpgv,directive-verify-failed "incorrect signature rejected"
 } email-to {
@@ -201,7 +201,7 @@ check_loose_directive "bogus: signed with wrong key and directory repeated" {
     } dsig { good 01 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,bad-directory-repeat "duplicate directory rejected"
 } email-to {
@@ -219,7 +219,7 @@ check_loose_directive "bogus: signed with wrong key and directory ambiguous" {
     } dsig { good 01 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,bad-directory-repeat "ambiguous directory rejected"
 } email-to {
@@ -236,7 +236,7 @@ check_loose_directive "bogus: signed with wrong key and too deep" {
     } dsig { good 01 1001 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,bad-directory-depth "excessively deep directory rejected"
 } email-to {
@@ -252,7 +252,7 @@ check_loose_directive "bogus: signed for bogus package" {
     } dsig { good 02 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     unknown-package "unknown package from directive"
 } email-to {
@@ -268,7 +268,7 @@ check_loose_directive "bogus: signed for package with no email address" {
        comment "do nothing"
     } dsig { good 03 1001 }
 } file-tree {
-    { inbox in-stage stage pub archive } empty {}
+    { inbox scratch stage pub archive } empty {}
 } email-to {
     ftp-upload-script@gnu.org ftp-upload-report@gnu.org
 }
@@ -281,7 +281,7 @@ check_loose_directive "bogus: no actual command" {
     } dsig { good 04 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,no-op "null directive rejected"
 } email-to {
@@ -298,7 +298,7 @@ check_loose_directive "bogus: set 'replace' but no actual command" {
     } dsig { good 05 1000 }
 } file-tree {
     { inbox stage pub archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
 } log {
     validate,no-op "null directive rejected"
 } email-to {
@@ -317,7 +317,7 @@ check_loose_directive "create symlink" {
 } initial-files {
     pub { foo/foo-1.2.bin { good 06 1000 } }
 } file-tree {
-    { inbox in-stage stage archive } empty {}
+    { inbox scratch 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 {
-    { inbox in-stage stage archive } empty {}
+    { inbox scratch 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 {
@@ -359,7 +359,7 @@ check_loose_directive "error: create symlink using /../ in name" {
     }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/bar/README }
 } log {
     validate,bad-parameter,symlink \
@@ -379,7 +379,7 @@ check_loose_directive "error: create symlink using /../ in target" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink \
@@ -399,7 +399,7 @@ check_loose_directive "error: create symlink with bogus name" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "bogus symlink name rejected"
@@ -418,7 +418,7 @@ check_loose_directive "error: create symlink with bogus target" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "bogus symlink target rejected"
@@ -437,7 +437,7 @@ check_loose_directive "error: create symlink with absolute name" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "absolute symlink name rejected"
@@ -456,7 +456,7 @@ check_loose_directive "error: create symlink with absolute target" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "absolute symlink target rejected"
@@ -475,7 +475,7 @@ check_loose_directive "error: create symlink with only one parameter" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "bogus symlink command rejected"
@@ -494,7 +494,7 @@ check_loose_directive "error: create symlink with too many parameters" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,symlink "bogus symlink command rejected"
@@ -517,7 +517,7 @@ check_loose_directive "replace symlink" {
 } initial-symlinks {
     pub { foo-1.0.bin foo/foo-latest.bin }
 } file-tree {
-    { inbox in-stage stage archive } empty {}
+    { inbox scratch 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 {
-    { inbox in-stage stage archive } empty {}
+    { inbox scratch stage archive } empty {}
     { pub } files { foo/foo-1.2.bin }
 } log {
     action,rm-symlink "recorded removal of symlink"
@@ -559,7 +559,7 @@ check_loose_directive "error: remove symlink using /../" {
     pub { foo-1.2.bin foo/foo-latest.bin }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } 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 }
 } log {
@@ -580,7 +580,7 @@ check_loose_directive "error: remove symlink with bogus name" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,rmsymlink \
@@ -602,7 +602,7 @@ check_loose_directive "error: remove symlink with absolute name" {
     pub { foo-1.0.bin foo/foo-latest.bin }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } 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 }
 } log {
@@ -623,7 +623,7 @@ check_loose_directive "error: remove symlink with too many parameters" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     validate,bad-parameter,rmsymlink \
@@ -643,7 +643,7 @@ check_loose_directive "error: remove non-existent symlink" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     action,rm-symlink-failure,not-found \
@@ -663,7 +663,7 @@ check_loose_directive "error: remove file as if symlink" {
     pub { foo/foo-1.0.bin { good 05 1000 } }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin }
 } log {
     action,rm-symlink-failure,not-link \
@@ -686,7 +686,7 @@ check_loose_directive "error: replace file with symlink" {
     }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
     action,make-symlink-failure "overwrite with symlink fails"
@@ -694,7 +694,7 @@ check_loose_directive "error: replace file with symlink" {
     ftp-upload-script@gnu.org ftp-upload-report@gnu.org
     foo@example.org foo@example.gnu.org foo@example.net
 }
-# TODO: The in-stage tree should be empty after this test.
+# TODO: The scratch tree should be empty after this test.
 
 check_loose_directive "archive file" {
     directive {
@@ -708,7 +708,7 @@ check_loose_directive "archive file" {
        foo/foo-1.2.bin { good 06 1000 }
     }
 } file-tree {
-    { inbox in-stage stage } empty {}
+    { inbox scratch 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 {
-    { inbox in-stage stage } empty {}
+    { inbox scratch 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 {
-    { inbox in-stage stage } empty {}
+    { inbox scratch stage } empty {}
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
     { archive } archived-files { foo/foo-latest.bin }
 } log {
@@ -781,7 +781,7 @@ check_loose_directive "error: archive non-existent file" {
     }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.2.bin }
 } log {
     action,archive-failure,not-found "cannot archive nonexistent file"
@@ -803,7 +803,7 @@ check_loose_directive "error: archive bogus name" {
     }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
     validate,bad-parameter,archive \
@@ -826,7 +826,7 @@ check_loose_directive "error: archive name using /../" {
     }
 } file-tree {
     { inbox stage archive } empty {}
-    { in-stage } files { .foo.directive.asc }
+    { scratch } files { .foo.directive.asc }
     { pub } files { foo/foo-1.0.bin foo/foo-1.2.bin }
 } log {
     validate,bad-parameter,archive \

diff --git a/testsuite/gatekeeper.all/03_triplet.exp b/testsuite/gatekeeper.all/03_triplet.exp
index 815a82c1b4cc99f09ef3696c37352611a4e33c1e..9eaefc5ef0bfa8b8c9bb70dcb68c4e4f2334a047 100644 (file)
--- a/testsuite/gatekeeper.all/03_triplet.exp
+++ b/testsuite/gatekeeper.all/03_triplet.exp
@@ -105,7 +105,7 @@ check_triplet "bogus: signature from unknown key in directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
        }
     } log {
@@ -141,7 +141,7 @@ check_triplet "bogus: signature from unknown key on file" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
        }
     } log {
@@ -180,7 +180,7 @@ check_triplet "bogus: bad signature in directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
        }
     } log {
@@ -216,7 +216,7 @@ check_triplet "bogus: bad signature on file" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.tar.gz.directive.asc .foo.tar.gz.sig .foo.tar.gz
        }
     } log {
@@ -248,7 +248,7 @@ check_triplet "bogus: empty directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin .foo.bin.sig .foo.bin.directive.asc
        }
     } log {
@@ -281,7 +281,7 @@ check_triplet "bogus: directive with unknown key" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin .foo.bin.sig .foo.bin.directive.asc
        }
     } log {
@@ -318,7 +318,7 @@ check_triplet "bogus: signed for unknown package" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -359,7 +359,7 @@ check_triplet "bogus: signed but package has no keys" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -404,7 +404,7 @@ check_triplet "bogus: signed but package has no email addresses" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -440,7 +440,7 @@ check_triplet "bogus: directive signature from the future" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -475,7 +475,7 @@ check_triplet "bogus: file signature from the future" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -518,7 +518,7 @@ check_triplet "bogus: signed with wrong key" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -560,7 +560,7 @@ check_triplet "bogus: signed with wrong key in directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -603,7 +603,7 @@ check_triplet "bogus: signed with wrong key on file" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .bar.tar.gz.directive.asc .bar.tar.gz.sig .bar.tar.gz
        }
     } log {
@@ -649,7 +649,7 @@ check_triplet "bogus: version field not a number" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -683,7 +683,7 @@ check_triplet "bogus: invalid v1.0 format directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -715,7 +715,7 @@ check_triplet "obsolete: v1.0 format directive" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -750,7 +750,7 @@ check_triplet "bogus: duplicated version key" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -785,7 +785,7 @@ check_triplet "bogus: ambiguous version declaration" setup {
 } check {
     file-tree {
        { inbox stage pub archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
     } log {
@@ -822,7 +822,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -856,7 +856,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -892,7 +892,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -928,7 +928,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -963,7 +963,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -997,7 +997,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -1031,7 +1031,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -1075,7 +1075,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
            }] check [subst {
                file-tree {
                    { inbox stage pub archive } empty {}
-                   { in-stage } files {
+                   { scratch } files {
                        .foo.bin.directive.asc .foo.bin.sig .foo.bin
                    }
                } log {
@@ -1111,7 +1111,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
        }] check {
            file-tree {
                { inbox stage pub archive } empty {}
-               { in-stage } files {
+               { scratch } files {
                    .foo.bin.directive.asc .foo.bin.sig .foo.bin
                }
            } log {
@@ -1147,7 +1147,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
        }] check {
            file-tree {
                { inbox stage pub archive } empty {}
-               { in-stage } files {
+               { scratch } files {
                    .foo.bin.directive.asc .foo.bin.sig .foo.bin
                }
            } log {
@@ -1184,7 +1184,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
        }] check {
            file-tree {
                { inbox stage pub archive } empty {}
-               { in-stage } files {
+               { scratch } files {
                    .foo.bin.directive.asc .foo.bin.sig .foo.bin
                }
            } log {
@@ -1227,7 +1227,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
        }
     }] check [subst {
        file-tree {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch 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 {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch stage archive } empty {}
            { pub } files {
                foo/bar/v$FVER/foo.bin.sig foo/bar/v$FVER/foo.bin
            }
@@ -1302,7 +1302,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check [subst {
        file-tree {
            { inbox stage pub archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
        } log {
@@ -1338,7 +1338,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
        }
     }] check [subst {
        file-tree {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch stage archive } empty {}
            { pub } files {
                foo/bar/v$FVER/foo.bin.sig foo/bar/v$FVER/foo.bin
            }
@@ -1378,7 +1378,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
            { pub } files {
@@ -1421,7 +1421,7 @@ foreach FVER $DIRECTIVE_FORMAT_VERSIONS {
     }] check {
        file-tree {
            { inbox stage archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
            { pub } files {
@@ -1465,7 +1465,7 @@ check_triplet "bogus: v1.1 format directive to replace file" setup {
 } check {
     file-tree {
        { inbox stage archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
        { pub } files {
@@ -1506,7 +1506,7 @@ check_triplet "v1.2 format directive to replace file" setup {
     }
 } check {
     file-tree {
-       { inbox in-stage stage } empty {}
+       { inbox scratch stage } empty {}
        { pub } files {
            foo/foo.bin foo/foo.bin.sig
        }
@@ -1546,7 +1546,7 @@ check_triplet "bogus: v1.2 format directive with bogus replace value" setup {
 } check {
     file-tree {
        { inbox stage archive } empty {}
-       { in-stage } files {
+       { scratch } files {
            .foo.bin.directive.asc .foo.bin.sig .foo.bin
        }
        { pub } files {

diff --git a/testsuite/gatekeeper.all/11_am_cve.exp b/testsuite/gatekeeper.all/11_am_cve.exp
index efe86465f4a0223464d0ef06052311c4f8f21564..b2beda9e690751b2b6be7032d26cfb9f986b744e 100644 (file)
--- a/testsuite/gatekeeper.all/11_am_cve.exp
+++ b/testsuite/gatekeeper.all/11_am_cve.exp
@@ -70,7 +70,7 @@ proc check_am_cve_upload {desc fragment {log {}}} {
     analyze_file_tree $tenv "am_cve: $desc" \
        { inbox stage pub archive } empty {}
     analyze_file_tree $tenv "am_cve: $desc" \
-       { in-stage } files {
+       { scratch } 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 5722f333544915a4da1ff8b20947da29a42b7b2e..6f0fa04f44f88bfc40897b9bfa90c5503a6be7b6 100644 (file)
--- 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" \
-       { inbox in-stage stage archive } empty {}
+       { inbox scratch 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 a2ef1aae5414b1bdabebb01c4107bda2b8bc8310..899aac83357e6342e08f0595ede6e5b15e2cc0b7 100644 (file)
--- 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 {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch stage archive } empty {}
            { pub } files {
                foo/foo.bin.sig foo/foo.bin
            }
@@ -136,7 +136,7 @@ check_ratchet_handling "simple replay of new upload" setup {
     } check {
        file-tree {
            { inbox stage archive } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
            { pub } files {
@@ -174,7 +174,7 @@ check_ratchet_handling "replace new upload" setup {
        }
     } check {
        file-tree {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch 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 {
-           { inbox in-stage stage } empty {}
+           { inbox scratch stage } empty {}
            { archive } archived-files {
                foo/foo.bin
            }
@@ -240,7 +240,7 @@ check_ratchet_handling "replay replaced upload" setup {
        }
     } check {
        file-tree {
-           { inbox in-stage stage archive } empty {}
+           { inbox scratch 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 {
-           { inbox in-stage stage } empty {}
+           { inbox scratch stage } empty {}
            { archive } archived-files {
                foo/foo.bin
            }
@@ -296,7 +296,7 @@ check_ratchet_handling "replay replaced upload" setup {
     } check {
        file-tree {
            { inbox stage } empty {}
-           { in-stage } files {
+           { scratch } files {
                .foo.bin.directive.asc .foo.bin.sig .foo.bin
            }
            { archive } archived-files {

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 1cad536bf72b3056ef6fabb692de1adf1fb267f6..521dfe67cf2974f299a08b9bbac0fe3f10c59015 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -85,7 +85,7 @@ proc make_test_environment { base_dir } {
     file mkdir $base_dir
     file mkdir [file join $base_dir packages]
     file mkdir [file join $base_dir inbox]
-    file mkdir [file join $base_dir in-stage]
+    file mkdir [file join $base_dir scratch]
     file mkdir [file join $base_dir stage]
     file mkdir [file join $base_dir pub]
     file mkdir [file join $base_dir archive]