dgit-repos-policy-debian: Fix error handling, and test fixes

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 0e188cca4280e83cf1f3de309198901c226b8cf7..34281898f1def77f8b07cf730c2eea4dc444b1cc 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -101,12 +101,15 @@ t-prep-newpackage () {
 t-archive-none () {
        p=$1
        mkdir -p $tmp/aq $tmp/mirror/pool/main
-       mkdir -p $tmp/aq/dsc_in_suite $tmp/aq/dsc_in_suite/sid
 
        local suite=sid
+
        >$tmp/aq/package.$suite.$p
        t-archive-updated $suite $p
 
+       >$tmp/aq/package.new.$p
+       t-archive-updated new $p
+
        ln -s sid $tmp/aq/dsc_in_suite/unstable
        cat <<'END' >$tmp/aq/suites
 [
@@ -128,7 +131,9 @@ END
 t-archive-updated () {
        local suite=$1
        local p=$2
-       perl <$tmp/aq/package.$suite.$p >$tmp/aq/dsc_in_suite/$suite/$p -wne '
+       local suitedir=$tmp/aq/dsc_in_suite/$suite
+       mkdir -p $suitedir
+       perl <$tmp/aq/package.$suite.$p >$suitedir/$p -wne '
                use JSON;
                use strict;
                our @v;