Tests: Check that --deliberately-include-questionable-history actually works

[dgit.git] / tests / lib

diff --git a/tests/lib b/tests/lib
index 0e188cca4280e83cf1f3de309198901c226b8cf7..377c5fd1e4dd93a71bef4ff4d1fbf438e3fa65d1 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -90,23 +90,27 @@ t-prep-newpackage () {
        v=$2
        t-archive-none $p
        t-git-none
-       v=3-1
        t-worktree $v
        cd $p
-       git branch -m dgit/sid master
-       git remote rm dgit
+       if ! git-show-ref --verify --quiet refs/heads/master; then
+               git branch -m dgit/sid master
+               git remote rm dgit
+       fi
        cd ..
 }
 
 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 +132,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;
@@ -362,6 +368,11 @@ t-debpolicy () {
        t-policy-admin create-db
 }
 
+t-policy-periodic () {
+       ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
+               test-dummy $drs_dispatch '' --cron
+}
+
 t-chain-test () {
        local ct=$1
        local d=${0%/*}