chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit: Set up a merge driver for debian/changelog. Closes:#769291.
[dgit.git]
/
tests
/
tests
/
debpolicy-newreject
diff --git
a/tests/tests/debpolicy-newreject
b/tests/tests/debpolicy-newreject
index 2204244ab7163f10d45f7177b51458e5980bfced..6987ef3a364aab532e869cd4c7343d20f70d4d1d 100755
(executable)
--- a/
tests/tests/debpolicy-newreject
+++ b/
tests/tests/debpolicy-newreject
@@
-50,7
+50,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
test-dummy
/${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
@@
-101,16
+101,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
test-dummy
/$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
+echo
ok.