chiark / gitweb /
test suite: Fix trustingpolicy-replay & dput-ng.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 5 Jul 2018 00:06:26 +0000 (01:06 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 5 Jul 2018 00:06:27 +0000 (01:06 +0100)
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>
debian/changelog
tests/tests/trustingpolicy-replay

index 4912f01..6c68113 100644 (file)
@@ -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.
 
  --
 
index ad731f5..e56ec7b 100755 (executable)
@@ -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