chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 9.14
[dgit.git]
/
tests
/
tests
/
debpolicy-newreject
diff --git
a/tests/tests/debpolicy-newreject
b/tests/tests/debpolicy-newreject
index 2204244ab7163f10d45f7177b51458e5980bfced..af02ac147d29b26405bed855ec8d31293cd8b5fd 100755
(executable)
--- a/
tests/tests/debpolicy-newreject
+++ b/
tests/tests/debpolicy-newreject
@@
-10,7
+10,7
@@
t-prep-newpackage example 1.0
cd $p
revision=1
git tag start
cd $p
revision=1
git tag start
-t-
pre
p-mergechangelogs
+t-
dgit setu
p-mergechangelogs
echo FORBIDDEN >debian/some-file
git add debian/some-file
echo FORBIDDEN >debian/some-file
git add debian/some-file
@@
-18,6
+18,7
@@
t-commit 'Commit a forbidden thing'
bad=`git rev-parse HEAD:debian/some-file`
t-policy-admin taint --global "$bad" "forbidden for testing"
bad=`git rev-parse HEAD:debian/some-file`
t-policy-admin taint --global "$bad" "forbidden for testing"
+t-policy-admin taint --global "$bad" "forbidden for testing - again"
t_expect_push_fail_hook+='
t-git-objects-not-present "" $bad
t_expect_push_fail_hook+='
t-git-objects-not-present "" $bad
@@
-50,13
+51,14
@@
t-git-dir-check enoent
t-commit 'should require --deliberately...questionable'
t-dgit build
t-commit 'should require --deliberately...questionable'
t-dgit build
-t-expect-push-fail E:"tag
debian
/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
+t-expect-push-fail E:"tag
$tagpfx
/${vanished//./\\.} referred to this object.*all previously pushed versions were found to have been removed" \
t-dgit push --new
t-git-dir-check enoent
vanished=$v
t-dgit push --new
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
t-git-dir-check secret
t-policy-periodic
@@
-80,9
+82,9
@@
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
"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 $
tmp/git/$p.git
+cd $
dgitrepo
t-expect-push-fail "Not a valid object name" \
git cat-file -p $oldobj
cd $tmp/$p
t-expect-push-fail "Not a valid object name" \
git cat-file -p $oldobj
cd $tmp/$p
@@
-93,7
+95,8
@@
t-expect-push-fail \
"Package is in NEW and has not been accepted or rejected yet" \
t-dgit push
"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
t-archive-process-incoming sid
@@
-101,16
+104,20
@@
t-commit 'Check taint is no longer there'
t-dgit build
t-dgit push
t-dgit build
t-dgit push
-git checkout -b stoats
debian
/$vanished
+git checkout -b stoats
$tagpfx
/$vanished
t-commit 'Simulate accidentally building on rejected version'
t-dgit build
t-expect-push-fail "HEAD is not a descendant of the archive's version" \
t-dgit push
t-commit 'Simulate accidentally building on rejected version'
t-dgit build
t-expect-push-fail "HEAD is not a descendant of the archive's version" \
t-dgit push
+: "check that uploader can't force it now"
+t-expect-push-fail "not fast forward on dgit branch" \
+t-dgit --deliberately-not-fast-forward push
+
t-dgit pull
t-dgit build
t-expect-push-fail \
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
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
-echo xxx want to test database lock retry thing on push-and-taint
+t-ok