Test suite: move t-commit and break out t-policy (nfc)

diff --git a/tests/lib b/tests/lib
index 7b176539a1899e640342cf14f210a765fc1061e1..aec86127d227ac0c4f81af3304ba4be42aa3d470 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -370,6 +370,15 @@ t-apply-diff () {
                | patch -p1 -u
 }
 
                | patch -p1 -u
 }
 

+t-commit () {
+       local msg=$1
+       v=1.$revision
+       dch -v$v --distribution unstable "$1"
+       git add debian/changelog
+       debcommit
+       revision=$(( $revision + 1 ))
+}
+

 t-git-config () {
        git config --global "$@"
 }
 t-git-config () {
        git config --global "$@"
 }


@@ -414,16 +423,21 @@ t-policy-admin () {
        ${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
 }
 
        ${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
 }
 

-t-debpolicy () {
+t-policy () {
+       local policyhook=$1

        t-dsd
 
        t-dsd
 

-       ln -sf ${DGIT_INFRA_PFX}dgit-repos-policy-debian \
+       ln -sf ${DGIT_INFRA_PFX}$policyhook \

                $drs_dispatch/policy-hook
 
        mkdir $tmp/git
        t-policy-admin create-db
 }
 
                $drs_dispatch/policy-hook
 
        mkdir $tmp/git
        t-policy-admin create-db
 }
 

+t-debpolicy () {
+       t-policy dgit-repos-policy-debian
+}
+

 t-policy-periodic () {
        ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
                test-dummy $drs_dispatch '' --cron
 t-policy-periodic () {
        ${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
                test-dummy $drs_dispatch '' --cron

diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index e64ed6ea5c8ea4db514db3ff14eac2a1a9773793..c1192d1693e8ee1f1eec2fc24c344151a4d3e452 100755 (executable)
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -8,17 +8,7 @@ t-debpolicy
 t-prep-newpackage example 1.0
 
 cd $p
 t-prep-newpackage example 1.0
 
 cd $p

-

 revision=1
 revision=1

-t-commit () {
-       local msg=$1
-       v=1.$revision
-       dch -v$v --distribution unstable "$1"
-       git add debian/changelog
-       debcommit
-       revision=$(( $revision + 1 ))
-}
-

 git tag start
 
 echo FORBIDDEN >debian/some-file
 git tag start
 
 echo FORBIDDEN >debian/some-file