chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: test suite: gdr-import-dgit: introduce nmu-upload-1, -2
[dgit.git]
/
tests
/
tests
/
debpolicy-newreject
diff --git
a/tests/tests/debpolicy-newreject
b/tests/tests/debpolicy-newreject
index 2204244ab7163f10d45f7177b51458e5980bfced..1fa6751782df0adc8b5d996d6701da8f76ea9e65 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,7
+51,7
@@
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
t-dgit push --new
t-git-dir-check enoent
@@
-82,7
+83,7
@@
t-dgit --deliberately-TEST-dgit-only-not-fast-forward push
t-dgit --deliberately-not-fast-forward push
t-dgit --deliberately-not-fast-forward 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
@@
-101,16
+102,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 push
t-dgit pull
t-dgit build
t-expect-push-fail \
'Reason: rewound suite sid; --deliberately-not-fast-forward specified' \
t-dgit push
-echo xxx want to test database lock retry thing on push-and-taint
+t-ok