[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#925161: marked as done (stretch-pu: package diffoscope/78+deb9u1)

Your message dated Sat, 27 Apr 2019 11:14:32 +0100
with message-id <1556360072.2690.35.camel@adam-barratt.org.uk>
and subject line Closing bugs for updates included in 9.9
has caused the Debian Bug report #925161,
regarding stretch-pu: package diffoscope/78+deb9u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
925161: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925161
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

Dear SRM,

I've just uploaded an update to diffoscope, versioned as 78+deb9u1, to
fix the FTBFS caused by the updated ghostscripts that arrived through
stretch-security some months ago.

It's a cherry-pick of several commits that have been in buster for quite
some time already.

I also had to tweak the sanity version check in d/rules; I haven't
documented that change, with it being a completely transparent change to
everything.

Thanks for considering.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for diffoscope-78 diffoscope-78+deb9u1

 debian/changelog                 |    7 +++++++
 debian/rules                     |    6 +++++-
 tests/comparators/test_ps.py     |   23 +++++++++++++++++++----
 tests/data/ps_text_expected_diff |   11 ++++-------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff -Nru diffoscope-78/debian/changelog diffoscope-78+deb9u1/debian/changelog
--- diffoscope-78/debian/changelog	2017-02-26 17:26:48.000000000 +0100
+++ diffoscope-78+deb9u1/debian/changelog	2019-03-20 17:27:42.000000000 +0100
@@ -1,3 +1,10 @@
+diffoscope (78+deb9u1) stretch; urgency=medium
+
+  * tests:
+    + Fix ps tests to pass with the new ghostscript 9.26.  Closes: #925051
+
+ -- Mattia Rizzolo <mattia@debian.org>  Wed, 20 Mar 2019 17:27:42 +0100
+
 diffoscope (78) unstable; urgency=medium
 
   [ Brett Smith ]
diff -Nru diffoscope-78/debian/rules diffoscope-78+deb9u1/debian/rules
--- diffoscope-78/debian/rules	2017-02-13 13:24:56.000000000 +0100
+++ diffoscope-78+deb9u1/debian/rules	2019-03-20 17:27:42.000000000 +0100
@@ -14,7 +14,11 @@
      $(error Version in debian/changelog does not match diffoscope version or backport policy)
     endif
   else
-   $(error Version in debian/changelog does not match diffoscope version)
+    ifeq ($(DIST),stretch)
+     $(info "Stable update!  ☺")
+    else
+     $(error Version in debian/changelog does not match diffoscope version)
+    endif
   endif
  endif
 endif
diff -Nru diffoscope-78/tests/comparators/test_ps.py diffoscope-78+deb9u1/tests/comparators/test_ps.py
--- diffoscope-78/tests/comparators/test_ps.py	2017-02-10 23:54:34.000000000 +0100
+++ diffoscope-78+deb9u1/tests/comparators/test_ps.py	2019-03-20 17:26:47.000000000 +0100
@@ -18,38 +18,53 @@
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
 import pytest
+import subprocess
 
 from diffoscope.comparators.ps import PsFile
 
 from utils.data import load_fixture, get_data
-from utils.tools import skip_unless_tools_exist
+from utils.tools import skip_unless_tools_exist, \
+    skip_unless_tool_is_at_least
 from utils.nonexisting import assert_non_existing
 
 
 ps1 = load_fixture('test1.ps')
 ps2 = load_fixture('test2.ps')
 
+
+def ps2ascii_version():
+    return subprocess.check_output(('ps2ascii', '--version')).decode('utf-8')
+
+
 def test_identification(ps1):
     assert isinstance(ps1, PsFile)
 
+
+@skip_unless_tool_is_at_least('ps2ascii', ps2ascii_version, '9.21')
 def test_no_differences(ps1):
     difference = ps1.compare(ps1)
     assert difference is None
 
+
 @pytest.fixture
 def differences(ps1, ps2):
     return ps1.compare(ps2)
 
-@skip_unless_tools_exist('ps2ascii')
+
+@skip_unless_tool_is_at_least('ps2ascii', ps2ascii_version, '9.21')
 def test_internal_diff(differences):
     expected_diff = get_data('ps_internal_expected_diff')
     assert differences.unified_diff == expected_diff
 
-@skip_unless_tools_exist('ps2ascii')
+
+@skip_unless_tool_is_at_least('ps2ascii', ps2ascii_version, '9.26')
 def test_text_diff(differences):
+    computed_diff = differences.details[0].unified_diff.replace('\r\n', '\n')
     expected_diff = get_data('ps_text_expected_diff')
-    assert differences.details[0].unified_diff == expected_diff
+    assert computed_diff == expected_diff
+
 
 @skip_unless_tools_exist('ps2ascii')
+@skip_unless_tool_is_at_least('ps2ascii', ps2ascii_version, '9.21')
 def test_compare_non_existing(monkeypatch, ps1):
     assert_non_existing(monkeypatch, ps1, has_null_source=False)
diff -Nru diffoscope-78/tests/data/ps_text_expected_diff diffoscope-78+deb9u1/tests/data/ps_text_expected_diff
--- diffoscope-78/tests/data/ps_text_expected_diff	2017-01-14 11:59:14.000000000 +0100
+++ diffoscope-78+deb9u1/tests/data/ps_text_expected_diff	2019-03-20 17:26:29.000000000 +0100
@@ -1,7 +1,4 @@
-@@ -1,5 +1,5 @@
- 
- 
--Today's date: February 28, 2016
-+Today's date: February 27, 2016
- 
- 1
+@@ -1,2 +1,2 @@
+-                Today’s date: February 28, 2016
++                Today’s date: February 27, 2016
+                                1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Version: 9.9

Hi,

The update referenced by each of these bugs was included in this
morning's stretch point release.

Regards,

Adam

--- End Message ---
Reply to: