summaryrefslogtreecommitdiff
path: root/tests/tests/debpolicy-newreject
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-09-16 15:31:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-09-16 15:31:50 -0700
commitb773eefd1773bc2195f87f03721c89f7efb498f3 (patch)
treeb5e6e444b9f0786132a8f798bd6141878521cf7d /tests/tests/debpolicy-newreject
parent1045e26443f21378d6fb98a46ace40c0d883cea6 (diff)
parent896c94474922bc2698474c5ba57321fa61504238 (diff)
Merge tag 'debian/9.9' into buster-bpo
dgit release 9.9 for unstable (sid) [dgit] [dgit distro=debian no-split] # gpg: Signature made Sat 14 Sep 2019 01:35:57 PM MST # gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39 # gpg: Can't check signature: No public key
Diffstat (limited to 'tests/tests/debpolicy-newreject')
-rwxr-xr-xtests/tests/debpolicy-newreject10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/tests/debpolicy-newreject b/tests/tests/debpolicy-newreject
index 1fa6751..af02ac1 100755
--- a/tests/tests/debpolicy-newreject
+++ b/tests/tests/debpolicy-newreject
@@ -57,7 +57,8 @@ t-git-dir-check enoent
vanished=$v
-t-dgit push --new --deliberately-include-questionable-history
+t-dgit push --new --deliberately-include-questionable-history \
+ --force-reusing-version
t-git-dir-check secret
t-policy-periodic
@@ -81,7 +82,7 @@ t-expect-push-fail \
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
-t-dgit --deliberately-not-fast-forward push
+t-dgit --deliberately-not-fast-forward --force-reusing-version push
cd $dgitrepo
t-expect-push-fail "Not a valid object name" \
@@ -94,7 +95,8 @@ t-expect-push-fail \
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit push
-t-dgit push --deliberately-include-questionable-history
+t-dgit push --deliberately-include-questionable-history \
+ --force-reusing-version
t-archive-process-incoming sid
@@ -116,6 +118,6 @@ t-dgit pull
t-dgit build
t-expect-push-fail \
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
-t-dgit push
+t-dgit --force-reusing-version push
t-ok