summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2019-11-30 23:25:40 -0500
committerMike Gilbert <floppym@gentoo.org>2019-11-30 23:26:52 -0500
commit34383b63cdb73f700f0e8b672d7a0e83b01dc2f0 (patch)
tree3763c2d6c880995a1a434d26f2c43b5066c01056 /dev-python/python-debian/files
parentx11-wm/xpra: add gtk introspection to RDEPEND. (diff)
downloadgentoo-34383b63cdb73f700f0e8b672d7a0e83b01dc2f0.tar.gz
gentoo-34383b63cdb73f700f0e8b672d7a0e83b01dc2f0.tar.bz2
gentoo-34383b63cdb73f700f0e8b672d7a0e83b01dc2f0.zip
dev-python/python-debian: bump to 0.1.36
Package-Manager: Portage-2.3.79_p3, Repoman-2.3.18_p2 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-python/python-debian/files')
-rw-r--r--dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch117
1 files changed, 117 insertions, 0 deletions
diff --git a/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch b/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
new file mode 100644
index 000000000000..64b040852b7d
--- /dev/null
+++ b/dev-python/python-debian/files/0.1.36-test-no-apt-pkg.patch
@@ -0,0 +1,117 @@
+From 0b4e4e02e62ab6069e855fc44fec1cbfba3e2f2a Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 30 Nov 2019 23:18:05 -0500
+Subject: [PATCH] Remove tests that rely on apt_pkg
+
+---
+ lib/debian/tests/test_deb822.py | 53 ---------------------------------
+ 1 file changed, 53 deletions(-)
+
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index 7101727..64a724c 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -40,8 +40,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg #type: ignore
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -465,11 +463,6 @@ class TestDeb822(unittest.TestCase):
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ text = StringIO()
+ text.write(UNPARSED_PACKAGE)
+@@ -487,10 +480,6 @@ class TestDeb822(unittest.TestCase):
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ for string in GPG_SIGNED:
+@@ -556,12 +545,7 @@ class TestDeb822(unittest.TestCase):
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -607,27 +591,11 @@ class TestDeb822(unittest.TestCase):
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+ deb822.Sources,
+@@ -973,27 +941,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+ UNPARSED_PARAGRAPHS_WITH_COMMENTS.splitlines(), use_apt_pkg=False))
+--
+2.24.0
+