test suite: Fix trustingpolicy-replay & dput-ng.

Specifically:

 * Only dput-ng actually complains about the existence of .upload
   files.  dput itself just says there is nothing to do and calls that
   success.

 * The call to t-rm-dput-dropping was in the wrong place.  t-commit
   bumps the version to 1.1 but it's 1.0 that needs removing.

Closes:#903007.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 4912f019b71c8d2fce214d36315a071b6b710412..6c681131d52f837586cd5222580c49dcc163332c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dgit (5.7~) unstable; urgency=medium
     in the comment about handling patch stacks.
   * dgit update-vcs-git: Honour --package properly.
   * test suite: Always pass LC_COLLATE=C to sort(1).  Closes:#903006.
+  * test suite: Fix trustingpolicy-replay & dput-ng.  Closes:#903007.
 
  --
 

diff --git a/tests/tests/trustingpolicy-replay b/tests/tests/trustingpolicy-replay
index ad731f5b317229910398f5e6472b48ab872e11ea..e56ec7b113a19e74f07137287d9e7b88dddf7353 100755 (executable)
--- a/tests/tests/trustingpolicy-replay
+++ b/tests/tests/trustingpolicy-replay
@@ -17,11 +17,12 @@ git tag start
 t-dgit build
 t-dgit push --new
 
+t-rm-dput-dropping
+
 t-commit 'Prep v1.1 which will be rewound'
 t-dgit build
 t-dgit push
 
-t-rm-dput-dropping
 git checkout $tagpfx/1.0
 t-dgit build
 t-dgit push --deliberately-fresh-repo