[Python-modules-commits] [twisted] 01/02: Update changelog for 17.1.0-1 release
Free Ekanayaka
freee at moszumanska.debian.org
Tue May 16 08:22:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
freee pushed a commit to tag debian/17.1.0-1
in repository twisted.
commit 49697b0f2471c40704b0a7dd9740cb6ca37d5582
Author: Free Ekanayaka <freee at debian.org>
Date: Fri Feb 17 10:31:48 2017 +0000
Update changelog for 17.1.0-1 release
---
debian/changelog | 6 +
debian/control | 2 +
debian/patches/0002-combinedlog.patch | 4 +-
debian/patches/0003-sphinx-theme.patch | 2 +-
debian/patches/0004-localIntersphinx.patch | 2 +-
debian/patches/0006-fix-sphinx-import-path.patch | 2 +-
debian/patches/0007-openssl-1.1.0.patch | 165 ++-------------------
debian/patches/0008-sort-option-keys.patch | 1 -
.../patches/0009-no-stderr-in-test_ckeygen.patch | 2 +-
.../0010-handle-setlocale-test-failure.patch | 27 ++++
debian/patches/series | 3 +-
debian/tests/unit-tests-2 | 2 +-
debian/tests/unit-tests-3 | 2 +-
13 files changed, 57 insertions(+), 163 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8a8c1f9..1ecb7ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+twisted (17.1.0-1) experimental; urgency=medium
+
+ * New upstream version 17.1.0
+
+ -- Free Ekanayaka <freee at debian.org> Fri, 17 Feb 2017 10:31:45 +0000
+
twisted (16.6.0-2) unstable; urgency=medium
* Make /usr/share/doc/python-twisted-runner-dbg a
diff --git a/debian/control b/debian/control
index ea9f152..9138bb9 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>=7.0.50~),
python-setuptools,
python-incremental,
python-constantly,
+ python-automat,
python-doc,
python3-all-dev,
python3-all-dbg,
@@ -20,6 +21,7 @@ Build-Depends: debhelper (>=7.0.50~),
python3-setuptools,
python3-incremental,
python3-constantly,
+ python3-automat,
python3-doc
Build-Depends-Indep: python3-sphinx
Standards-Version: 3.9.8
diff --git a/debian/patches/0002-combinedlog.patch b/debian/patches/0002-combinedlog.patch
index 9c43a08..fab6178 100644
--- a/debian/patches/0002-combinedlog.patch
+++ b/debian/patches/0002-combinedlog.patch
@@ -13,10 +13,10 @@ Bug-Debian https://bugs.debian.org/772629
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index 29370c1..24a31d8 100644
+index 2bb9756..75266ed 100644
--- a/src/twisted/web/http.py
+++ b/src/twisted/web/http.py
-@@ -2143,7 +2143,7 @@ def combinedLogFormatter(timestamp, request):
+@@ -2296,7 +2296,7 @@ def combinedLogFormatter(timestamp, request):
referrer = _escape(request.getHeader(b"referer") or b"-")
agent = _escape(request.getHeader(b"user-agent") or b"-")
line = (
diff --git a/debian/patches/0003-sphinx-theme.patch b/debian/patches/0003-sphinx-theme.patch
index a676350..3950fef 100644
--- a/debian/patches/0003-sphinx-theme.patch
+++ b/debian/patches/0003-sphinx-theme.patch
@@ -8,7 +8,7 @@ Set the sphinx theme.
1 file changed, 2 insertions(+)
diff --git a/docs/conf.py b/docs/conf.py
-index 1679d0c..5f498b2 100644
+index 299b5b4..2d23d59 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -120,6 +120,8 @@ on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
diff --git a/debian/patches/0004-localIntersphinx.patch b/debian/patches/0004-localIntersphinx.patch
index f39d37a..ab68cc1 100644
--- a/debian/patches/0004-localIntersphinx.patch
+++ b/debian/patches/0004-localIntersphinx.patch
@@ -11,7 +11,7 @@ Bug-Debian: https://bugs.debian.org/836169
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/conf.py b/docs/conf.py
-index 5f498b2..ab033a0 100644
+index 2d23d59..a806c64 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -359,8 +359,8 @@ traclinks_base_url = 'https://twistedmatrix.com/trac'
diff --git a/debian/patches/0006-fix-sphinx-import-path.patch b/debian/patches/0006-fix-sphinx-import-path.patch
index 756d926..0270d80 100644
--- a/debian/patches/0006-fix-sphinx-import-path.patch
+++ b/debian/patches/0006-fix-sphinx-import-path.patch
@@ -9,7 +9,7 @@ match the new source files location (src/).
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/conf.py b/docs/conf.py
-index ab033a0..4919d40 100644
+index a806c64..f7f8f93 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@ import os
diff --git a/debian/patches/0007-openssl-1.1.0.patch b/debian/patches/0007-openssl-1.1.0.patch
index c4206d2..82db886 100644
--- a/debian/patches/0007-openssl-1.1.0.patch
+++ b/debian/patches/0007-openssl-1.1.0.patch
@@ -4,39 +4,15 @@ Subject: openssl-1.1.0
Fix tests breakages with OpenSSL 1.1.0
---
- src/twisted/mail/test/test_options.py | 2 +-
- src/twisted/protocols/test/test_tls.py | 6 ++-
- src/twisted/test/server.pem | 95 +++++++++++++++++-----------------
- src/twisted/test/test_ssl.py | 10 ++--
- src/twisted/test/test_sslverify.py | 5 +-
- 5 files changed, 59 insertions(+), 59 deletions(-)
+ src/twisted/protocols/test/test_tls.py | 4 ++++
+ src/twisted/test/test_ssl.py | 10 +++-------
+ src/twisted/test/test_sslverify.py | 2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
-diff --git a/src/twisted/mail/test/test_options.py b/src/twisted/mail/test/test_options.py
-index cc0430b..34a431a 100644
---- a/src/twisted/mail/test/test_options.py
-+++ b/src/twisted/mail/test/test_options.py
-@@ -145,7 +145,7 @@ class OptionsTests(TestCase):
- The deprecated I{--pop3s} and I{--certificate} options set up a POP3 SSL
- server.
- """
-- cert = FilePath(__file__).sibling("server.pem")
-+ cert = FilePath(__file__).parent().parent().parent().child("test").child("server.pem")
- options = Options()
- options.parseOptions(['--pop3s', '8995',
- '--certificate', cert.path])
diff --git a/src/twisted/protocols/test/test_tls.py b/src/twisted/protocols/test/test_tls.py
-index 054e57c..68a6619 100644
+index 8027a00..1f78085 100644
--- a/src/twisted/protocols/test/test_tls.py
+++ b/src/twisted/protocols/test/test_tls.py
-@@ -520,7 +520,7 @@ class TLSMemoryBIOTests(TestCase):
- self.assertEqual(
- cert.digest('sha1'),
- # openssl x509 -noout -sha1 -fingerprint -in server.pem
-- b'45:DD:FD:E2:BD:BF:8B:D0:00:B7:D2:7A:BB:20:F5:34:05:4B:15:80')
-+ b'1A:C6:A7:22:D1:5F:4F:E4:AE:6C:CB:57:EA:1A:A9:B4:88:97:63:BF')
- handshakeDeferred.addCallback(cbHandshook)
- return handshakeDeferred
-
@@ -782,6 +782,7 @@ class TLSMemoryBIOTests(TestCase):
clientConnectionLost.addCallback(cbDisconnected)
return clientConnectionLost
@@ -61,119 +37,12 @@ index 054e57c..68a6619 100644
+
- class NonStreamingProducer(object):
-diff --git a/src/twisted/test/server.pem b/src/twisted/test/server.pem
-index 56af8a3..ddaf6fb 100644
---- a/src/twisted/test/server.pem
-+++ b/src/twisted/test/server.pem
-@@ -40,55 +40,54 @@ with open(b"server.pem", "wb") as fObj:
- fObj.write(b"'''\n")
- '''
- -----BEGIN PRIVATE KEY-----
--MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGnXh/GMCLpNNI
--AIvfBWlPrRCLFWxd2ICLYSUq3/jwh31CppGKlfaSmUYnrMxnT4hg2f6gBqlmq1gK
--jQqDkqQQtHsSljRQF58NRFtz99w45jRmrGs+F5zoggJuyv7/lKXy/BXOc40NodIl
--qRuo/uhoPjeXaUNziwpRj4rByRdLwQ6MfRcfdZ0TpVJ4J7apJ66pZt85L63u8TZi
--AZdBgcowX6giola7kUUMG66bSi2X6sIFxdXHwzrWlFNnSbKqOqKlGrjmBHUYqRFr
--gLALKkaMpF30olHn7QLqJ2592hMFVkOQAzNr8Xb15mF27BuWFYd7P6TirsxCEd+9
--BFFbhl0vAgMBAAECggEAf1ndN3GBlIi9SL/A7+GiYwpPPz8fWxVFZxmFIXa3QlM+
--CAyR6dC6Z8mL6EiuT9f5VFCzKZzb5g8bxrgk87SFKojvGT3ikTB0NaeNFFDrjjhd
--hTAtG4U8gQFL2gqjcvG3bpQgz13cJc+K1ccXC0dXce/i6Vz/eQjANwfZKuRr4Y/p
--Ml3ZtkarT7cZ2TZRDYd643U2nfrNmeLA9wwwO5mgNYu7HSpI4idpVM+rzoS9ZbU1
--Jxhrdq7GELvnd+Ko3WHTSrkQyb53GtJaLFOSAMxQlZAbRGJMv2VtXSPe+NyA0kxO
--V4O9CJ2QL1Bxqk4MQicKGtGoIsFbfR/qYQZgNEuHoQKBgQDlqEYSGpEcyKNvCjZ+
--Dv5hFUT7GZ24MNRvMBdMHPJEkmxvNpwaNkOGXL6zmhDk5Y0HOrzNv64Llmg623y0
--pn9Vh3CvMKDlq5t8910BJhXzZAM9/E9ui/YuQsFwCdWJQFYVMZUIAdylxbDkg6Mf
--WzHkx82edwWgb7hOFJhEW3h51wKBgQDdZaofTKeSLUmxIbF1yqm4iX67wyhHFFZL
--RZLEcu35ZTJqz3TRpr9KpHCtq9J2gZbqo2Dvqznwfk+yUqT2gkibtk3qvmv/qHQt
--FGX5joWLD2E22UgGc4bzonTSQcxPfPYjNZa6Iv7koPgJqO1k3aYLG3mDMgI/Yurz
--3j8udCI8aQKBgQCe8uNkfky3PkqXfNsQTnJTYTQ4EpettuYg+oj1Xgdz3F/+bS6H
--mc0Mfr5ichyFQDdmrImmYaclT/ld2zGpmp8A5FfieOazbx2T1WTieaixpyPzT+Du
--IyLFC+D0GWpYr1WlH4cFXryHY5c14cIR3r1emcc/iSM00n4eVHS6wxBUSwKBgQCQ
--fTAI20slgD7uxjF90XTwhXNbcONReDlVSKOfZ+5dbCj6QkhYJv4C5czP2yowwyRO
--H7A82j+m75htpbgZVS+zx8eUIxByumqPnRdsRhJrje8BD88MvsrdKDIbomuHmOM+
--WVP0SLCXX2JhU4kS4gDikNy9vZ5v5cu2ul37oDlTuQKBgBl4Qs6Q0xUotlvy/fMf
--L3c6GUIeRsLyQCKFfKYiUNLHqqutBSYmsAlx3XOhcK4DZ7/gFAXO6mpYJlwXOdrI
--IMcSXuJvZDPAYMXOyZUTgNjPcbQ8t0by+EKPwnTReIBf1Y17vPDfisf5IEKZEWvM
--YDXg6cfx9R5QePjvZohlItOu
-+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCyHscXffwghQ8W
-+uo5bvbg4KDEtWIXiY3tL5wbMocbKaCBQ1JgAv1jp7C4ka5yAYBQDmFT6dHdzAgOS
-+KrzqtH5tQl0pVuSAHOERDoSONk7mhNi+rMLuKcSFLBExrHkuhpLQbWtWf5/ohG0A
-+JLI/aiRjNWkQpX1glHU4aRSl+yUPq1NEP+R2CH+NN66BK2HK1MaYE2RFQ9WIMFdD
-+1quhzQ3+GgyN4vSgkKKMeOsYJXj0MGs2AdmTYyajz3I0BnHRX5dnX2KQ249kNSEC
-+YNWOPAIOkEb5ZA4KJNklspHD1rAYjEawelwda7y8Nu+1YXFjVIJXKvJ38ybvVWCb
-+hKkwpkWvAgMBAAECggEAVfD9tLsH3JT2y8ulhmRKr2XNHIj6yFmhkuTcZf2kkeKd
-+vQJmeO3aM7vOI6p8b4BsB7QHRHTPcYFGQc83KbN+0K7Vjm2rgJjuizFLCebwOM9e
-+WNm4j/s9I9g4T5RdP/KUgdZZlPmtKR5EDW6nRmurNOb/U5XVobTfviENYmyD3EPK
-+nJhh26YdPPg8RgJSLy5p6fWp80y7/4UKFUvrGO/ug6JGxyPMyq2oxXiasVCvHLsr
-+k+t0gcqXLNkCXkgc2e+9HB5FLwyGXpj0x57HRkz208tX7MYxkWfjuPDkUXQv/7dG
-+DnE8TeU5XfP4QPlwxpdiZ/AQYqOJQvwJNEY5ouWRAQKBgQDbY1gesintY+iH0Mdl
-+ktPinMoYHrzSFhHotE5O9q9tbx85F3plhQ4bHVtw2W4ZnwtEmpemm8jc2oYE+dGL
-+C+nsiqHMVjdTD6GEWRbRp+5YuaImLDld9TzDRlF5qRGu6ytMSM5ogTStW49h6d79
-+R8oa/kq6Y3RetJmnussc07uzLwKBgQDP2GWJ1tBjSymPWcSTX3t2JEVncShnDCJ7
-+qDeNw1agbKWW1lDSitUvNDsREFswbgWAYbLx/NTzh3c9Ulg9KYD6HTJqhl9xCJoo
-+kdjV6hL5LOL1RNbT7vlBeneZP1GBSY7yzBD/l1ATAMnUh3dU8j4CzUAap2dgs//I
-+YxTOS3v1gQKBgQCFDuevFlefhuzNEq8cx8SCuJ1Jq7rRoFkUTecAtVUIhlDli3vM
-+frpjb5a6BuVj3LY00Z4QioN0j4ShF/Mi5gLmV95x1AiR8/T+FBpm5fcFEPFrPX89
-+oTNNLCTWKNh0wmTsS2wErfiI+/Mma3W3IAdP/9LK4O7/UYGv3Pa7cR9yOQKBgQCD
-+di/jG0f7RdMnpHO9cys38oEjiGMxqm81H5TjyaXFGnMyEKRWRxHIJZUmmd3TqAM6
-+zJDOlkhrMEevNaIyLUoy6Ly2u/8qE3LOLlGkG8WcbVOwJrZqnkBxtfBnsbDvwYL0
-+9zXZM++l1V3TW0uTIxUt2HyvXyr382HZcTH7uarSAQKBgQCMAV51LiHApwZm8S4B
-+i0nK7ic2PqgRR58eJ4z2bEQBzrxveDEYhj3heOWoHSCjp9MPi7C/dQEwj0uuYuIH
-+77XJlyAMgqsFHKU8myeTSBXR7NU6rMdzegctzggKKuRiqwjGIdLRhNcZy5yK7At5
-+zjgdCib02bzY+Fz9hW/89iI10A==
- -----END PRIVATE KEY-----
- -----BEGIN CERTIFICATE-----
--MIID8DCCAtgCAws5AzANBgkqhkiG9w0BAQUFADCBuzELMAkGA1UEBhMCVFIxDjAM
--BgNVBAgUBcdvcnVtMRkwFwYDVQQHHhAAQgBhAV8AbQBhAGsA5wExMRIwEAYDVQQD
--Ewlsb2NhbGhvc3QxHDAaBgNVBAoTE1R3aXN0ZWQgTWF0cml4IExhYnMxJDAiBgNV
--BAsTG0F1dG9tYXRlZCBUZXN0aW5nIEF1dGhvcml0eTEpMCcGCSqGSIb3DQEJARYa
--c2VjdXJpdHlAdHdpc3RlZG1hdHJpeC5jb20wIBcNMTQwOTE2MDE0MjQ2WhgPMjEx
--NDA4MjMwMTQyNDZaMIG7MQswCQYDVQQGEwJUUjEOMAwGA1UECBQFx29ydW0xGTAX
--BgNVBAceEABCAGEBXwBtAGEAawDnATExEjAQBgNVBAMTCWxvY2FsaG9zdDEcMBoG
--A1UEChMTVHdpc3RlZCBNYXRyaXggTGFiczEkMCIGA1UECxMbQXV0b21hdGVkIFRl
--c3RpbmcgQXV0aG9yaXR5MSkwJwYJKoZIhvcNAQkBFhpzZWN1cml0eUB0d2lzdGVk
--bWF0cml4LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMadeH8Y
--wIuk00gAi98FaU+tEIsVbF3YgIthJSrf+PCHfUKmkYqV9pKZRieszGdPiGDZ/qAG
--qWarWAqNCoOSpBC0exKWNFAXnw1EW3P33DjmNGasaz4XnOiCAm7K/v+UpfL8Fc5z
--jQ2h0iWpG6j+6Gg+N5dpQ3OLClGPisHJF0vBDox9Fx91nROlUngntqknrqlm3zkv
--re7xNmIBl0GByjBfqCKiVruRRQwbrptKLZfqwgXF1cfDOtaUU2dJsqo6oqUauOYE
--dRipEWuAsAsqRoykXfSiUeftAuonbn3aEwVWQ5ADM2vxdvXmYXbsG5YVh3s/pOKu
--zEIR370EUVuGXS8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAK+HqbIUN6qHYYQZw
--7qqsTJWni8NOfK3aguyKAPcdCPP2DCZ6zlxxkUWL57gvsohyDu8Nr9iSI6wePjmI
--cN9eCZdc6mD9kYW4qBYhh2T48TOhEEW7zO6bWQUqWohHW+bG+GfrHnvxIx56OC2B
--eDS2djvvScYm45etlHprfrVEDIssh956O6qJCySax3D2w+i8YanXji1EbS61XTDw
--CMxDdWYmd2MDARRwlMcfcUIfKZUGl5NmqpnOx+H5MyAGwt86s647GMYZborQh+Mj
--tNHVpyKf/a8/HjqP1sCOrjCPZIjP6Qp5j4gifAjUStNmCgaBe7CpFtBSLnHqb4o/
--gU7u1w==
-+MIID6DCCAtACAws8FjANBgkqhkiG9w0BAQUFADCBtzELMAkGA1UEBhMCVFIxDzAN
-+BgNVBAgMBsOHb3J1bTEUMBIGA1UEBwwLQmHFn21ha8OnxLExEjAQBgNVBAMMCWxv
-+Y2FsaG9zdDEcMBoGA1UECgwTVHdpc3RlZCBNYXRyaXggTGFiczEkMCIGA1UECwwb
-+QXV0b21hdGVkIFRlc3RpbmcgQXV0aG9yaXR5MSkwJwYJKoZIhvcNAQkBFhpzZWN1
-+cml0eUB0d2lzdGVkbWF0cml4LmNvbTAgFw0xNjExMTAwODMzNDFaGA8yMTE2MTAx
-+NzA4MzM0MVowgbcxCzAJBgNVBAYTAlRSMQ8wDQYDVQQIDAbDh29ydW0xFDASBgNV
-+BAcMC0JhxZ9tYWvDp8SxMRIwEAYDVQQDDAlsb2NhbGhvc3QxHDAaBgNVBAoME1R3
-+aXN0ZWQgTWF0cml4IExhYnMxJDAiBgNVBAsMG0F1dG9tYXRlZCBUZXN0aW5nIEF1
-+dGhvcml0eTEpMCcGCSqGSIb3DQEJARYac2VjdXJpdHlAdHdpc3RlZG1hdHJpeC5j
-+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyHscXffwghQ8Wuo5b
-+vbg4KDEtWIXiY3tL5wbMocbKaCBQ1JgAv1jp7C4ka5yAYBQDmFT6dHdzAgOSKrzq
-+tH5tQl0pVuSAHOERDoSONk7mhNi+rMLuKcSFLBExrHkuhpLQbWtWf5/ohG0AJLI/
-+aiRjNWkQpX1glHU4aRSl+yUPq1NEP+R2CH+NN66BK2HK1MaYE2RFQ9WIMFdD1quh
-+zQ3+GgyN4vSgkKKMeOsYJXj0MGs2AdmTYyajz3I0BnHRX5dnX2KQ249kNSECYNWO
-+PAIOkEb5ZA4KJNklspHD1rAYjEawelwda7y8Nu+1YXFjVIJXKvJ38ybvVWCbhKkw
-+pkWvAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAHSklDritJ/KW9h2bfpw1lJWrrVQ
-+RIqWJEfJc+R508RUlx+/T13oWGE1Qv8tiT5GKDtUNtzqFIWVLZle2uHo9fjhZZpb
-+WtAsOzU7R5D8WwLW0nyDL+B6LCnso35Cb2W/qIqWTgU4HXQZ7XI/IGOb9W96RCLt
-+BXjuPghp55HSJYmHMUDAS9kHjtYV2Ds/FIS1OtDSzckyyZ8v06ck6EONbVWAzBsI
-+8tvuNmXyY/3F6TudTNJ804ZmbSGz0ge2DsTU3zOX5kNE+7gdW/CrcwludLfU7Y5y
-+TnsFAOBcf67uw/gfIFv9BmOrmgd9Egvs0HV19w8uJzawqtv15m5W0J/5iIo=
- -----END CERTIFICATE-----
- '''
+ class NonStreamingProducerTests(TestCase):
diff --git a/src/twisted/test/test_ssl.py b/src/twisted/test/test_ssl.py
-index 3959a84..c5a685c 100644
+index b329046..1d7144b 100644
--- a/src/twisted/test/test_ssl.py
+++ b/src/twisted/test/test_ssl.py
-@@ -182,7 +182,7 @@ def generateCertificateObjects(organization, organizationalUnit):
+@@ -184,7 +184,7 @@ def generateCertificateObjects(organization, organizationalUnit):
@return: a tuple of (key, request, certificate) objects.
"""
pkey = crypto.PKey()
@@ -182,7 +51,7 @@ index 3959a84..c5a685c 100644
req = crypto.X509Req()
subject = req.get_subject()
subject.O = organization
-@@ -666,14 +666,11 @@ class DefaultOpenSSLContextFactoryTests(unittest.TestCase):
+@@ -662,14 +662,11 @@ class DefaultOpenSSLContextFactoryTests(unittest.TestCase):
def test_method(self):
"""
L{ssl.DefaultOpenSSLContextFactory.getContext} returns an SSL context
@@ -198,7 +67,7 @@ index 3959a84..c5a685c 100644
# Make sure SSLv3 and TLSv1 aren't disabled though.
self.assertFalse(self.context._options & SSL.OP_NO_SSLv3)
self.assertFalse(self.context._options & SSL.OP_NO_TLSv1)
-@@ -715,10 +712,9 @@ class ClientContextFactoryTests(unittest.TestCase):
+@@ -711,10 +708,9 @@ class ClientContextFactoryTests(unittest.TestCase):
def test_method(self):
"""
L{ssl.ClientContextFactory.getContext} returns a context which can use
@@ -211,10 +80,10 @@ index 3959a84..c5a685c 100644
self.assertFalse(self.context._options & SSL.OP_NO_TLSv1)
diff --git a/src/twisted/test/test_sslverify.py b/src/twisted/test/test_sslverify.py
-index 479f31e..e6b1ab2 100644
+index acc05cd..26d6f55 100644
--- a/src/twisted/test/test_sslverify.py
+++ b/src/twisted/test/test_sslverify.py
-@@ -151,7 +151,7 @@ def counter(counter=itertools.count()):
+@@ -132,7 +132,7 @@ def counter(counter=itertools.count()):
def makeCertificate(**kw):
keypair = PKey()
@@ -223,13 +92,3 @@ index 479f31e..e6b1ab2 100644
certificate = X509()
certificate.gmtime_adj_notBefore(0)
-@@ -1312,7 +1312,8 @@ class ProtocolVersionTests(unittest.TestCase):
- self.assertEqual(
- set([ProtocolVersion.TLSv1_0,
- ProtocolVersion.TLSv1_1,
-- ProtocolVersion.TLSv1_2]),
-+ ProtocolVersion.TLSv1_2,
-+ ProtocolVersion.SSLv2]),
- self._protocols(sslverify.OpenSSLCertificateOptions()))
-
-
diff --git a/debian/patches/0008-sort-option-keys.patch b/debian/patches/0008-sort-option-keys.patch
index c448710..1a82e61 100644
--- a/debian/patches/0008-sort-option-keys.patch
+++ b/debian/patches/0008-sort-option-keys.patch
@@ -6,7 +6,6 @@ Fix flaky twisted.test.test_main.MainTests.test_twisted which fails
if options are not in the same order.
See https://twistedmatrix.com/trac/attachment/ticket/8923.
-
---
src/twisted/python/usage.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/0009-no-stderr-in-test_ckeygen.patch b/debian/patches/0009-no-stderr-in-test_ckeygen.patch
index 0b89dfa..88f48bb 100644
--- a/debian/patches/0009-no-stderr-in-test_ckeygen.patch
+++ b/debian/patches/0009-no-stderr-in-test_ckeygen.patch
@@ -10,7 +10,7 @@ https://twistedmatrix.com/trac/ticket/8924
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/twisted/conch/test/test_ckeygen.py b/src/twisted/conch/test/test_ckeygen.py
-index 49c1eca..a5727bd 100644
+index 57123d4..61c9dfb 100644
--- a/src/twisted/conch/test/test_ckeygen.py
+++ b/src/twisted/conch/test/test_ckeygen.py
@@ -7,6 +7,7 @@ Tests for L{twisted.conch.scripts.ckeygen}.
diff --git a/debian/patches/0010-handle-setlocale-test-failure.patch b/debian/patches/0010-handle-setlocale-test-failure.patch
new file mode 100644
index 0000000..5b501bd
--- /dev/null
+++ b/debian/patches/0010-handle-setlocale-test-failure.patch
@@ -0,0 +1,27 @@
+From: Free Ekanayaka <freee at debian.org>
+Date: Sat, 18 Feb 2017 13:50:23 +0000
+Subject: handle-setlocale-test-failure
+
+Gracefully handle setlocale failures during the test suite (e.g
+when running in a container).
+---
+ src/twisted/conch/test/test_cftp.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/twisted/conch/test/test_cftp.py b/src/twisted/conch/test/test_cftp.py
+index d24714e..01c7630 100644
+--- a/src/twisted/conch/test/test_cftp.py
++++ b/src/twisted/conch/test/test_cftp.py
+@@ -200,8 +200,10 @@ class ListingTests(TestCase):
+ locale.setlocale(locale.LC_ALL, "es_AR.UTF8")
+ except locale.Error:
+ test_localeIndependent.skip = "The es_AR.UTF8 locale is not installed."
+- finally:
+- locale.setlocale(locale.LC_ALL, currentLocale)
++ else:
++ locale.setlocale(locale.LC_ALL, currentLocale)
++ except:
++ pass
+
+
+ def test_newSingleDigitDayOfMonth(self):
diff --git a/debian/patches/series b/debian/patches/series
index 3b10682..e4b4f58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
0004-localIntersphinx.patch
0005-insecure-pythonpath.patch
0006-fix-sphinx-import-path.patch
-0007-openssl-1.1.0.patch
0008-sort-option-keys.patch
0009-no-stderr-in-test_ckeygen.patch
+0007-openssl-1.1.0.patch
+0010-handle-setlocale-test-failure.patch
diff --git a/debian/tests/unit-tests-2 b/debian/tests/unit-tests-2
index ccfe7e9..cac2311 100644
--- a/debian/tests/unit-tests-2
+++ b/debian/tests/unit-tests-2
@@ -2,4 +2,4 @@
chown nobody $AUTOPKGTEST_TMP
cd $AUTOPKGTEST_TMP
-echo python -m twisted.trial twisted | su -s /bin/sh nobody
+echo python -m twisted.trial --reporter=summary -e twisted | su -s /bin/sh nobody
diff --git a/debian/tests/unit-tests-3 b/debian/tests/unit-tests-3
index cfa0d1f..e829524 100644
--- a/debian/tests/unit-tests-3
+++ b/debian/tests/unit-tests-3
@@ -2,4 +2,4 @@
chown nobody $AUTOPKGTEST_TMP
cd $AUTOPKGTEST_TMP
-echo python3 -m twisted.trial twisted | su -s /bin/sh nobody
+echo python3 -m twisted.trial --reporter=summary -e twisted | su -s /bin/sh nobody
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/twisted.git
More information about the Python-modules-commits
mailing list