Browse code
Fixed python3 MakeCheck error
Change-Id: Ie1c1e5847b025822128a88e371415df1840e9b01
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3139
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
DheerajSShetty authored on 2017/07/01 08:14:46Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: A high-level scripting language |
| 2 | 2 |
Name: python3 |
| 3 | 3 |
Version: 3.6.1 |
| 4 |
-Release: 4%{?dist}
|
|
| 4 |
+Release: 5%{?dist}
|
|
| 5 | 5 |
License: PSF |
| 6 | 6 |
URL: http://www.python.org/ |
| 7 | 7 |
Group: System Environment/Programming |
| ... | ... |
@@ -10,7 +10,9 @@ Distribution: Photon |
| 10 | 10 |
Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
|
| 11 | 11 |
%define sha1 Python=91d880a2a9fcfc6753cbfa132bf47a47e17e7b16 |
| 12 | 12 |
Patch0: cgi3.patch |
| 13 |
-Patch2: python3-support-photon-platform.patch |
|
| 13 |
+Patch1: python3-support-photon-platform.patch |
|
| 14 |
+#https://github.com/python/cpython/pull/1320/commits/a252330d53afad6f8a4645933989bb017dc35ad8 |
|
| 15 |
+Patch2: skip-imaplib-test.patch |
|
| 14 | 16 |
BuildRequires: pkg-config >= 0.28 |
| 15 | 17 |
BuildRequires: bzip2-devel |
| 16 | 18 |
BuildRequires: ncurses-devel |
| ... | ... |
@@ -123,6 +125,7 @@ setuptools is a collection of enhancements to the Python distutils that allow yo |
| 123 | 123 |
%prep |
| 124 | 124 |
%setup -q -n Python-%{version}
|
| 125 | 125 |
%patch0 -p1 |
| 126 |
+%patch1 -p1 |
|
| 126 | 127 |
%patch2 -p1 |
| 127 | 128 |
|
| 128 | 129 |
%build |
| ... | ... |
@@ -249,6 +252,8 @@ rm -rf %{buildroot}/*
|
| 249 | 249 |
%{_bindir}/easy_install-3.6
|
| 250 | 250 |
|
| 251 | 251 |
%changelog |
| 252 |
+* Fri Jun 30 2017 Dheeraj Shetty <dheerajs@vmware.com> 3.6.1-5 |
|
| 253 |
+- Remove the imaplib tests. |
|
| 252 | 254 |
* Mon Jun 05 2017 Xiaolin Li <xiaolinl@vmware.com> 3.6.1-4 |
| 253 | 255 |
- Added pip, setuptools, xml, and curses sub packages. |
| 254 | 256 |
* Sun Jun 04 2017 Bo Gan <ganb@vmware.com> 3.6.1-3 |
| 255 | 257 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,35 @@ |
| 0 |
+From a252330d53afad6f8a4645933989bb017dc35ad8 Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Victor Stinner <victor.stinner@gmail.com> |
|
| 2 |
+Date: Thu, 27 Apr 2017 16:08:24 +0200 |
|
| 3 |
+Subject: [PATCH] bpo-30175: Skip client cert tests of test_imaplib |
|
| 4 |
+ |
|
| 5 |
+The IMAP server cyrus.andrew.cmu.edu doesn't accept our randomly |
|
| 6 |
+generated client x509 certificate anymore. |
|
| 7 |
+--- |
|
| 8 |
+ Lib/test/test_imaplib.py | 6 ++++++ |
|
| 9 |
+ 1 file changed, 6 insertions(+) |
|
| 10 |
+ |
|
| 11 |
+diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py |
|
| 12 |
+index 5ef9512c3f5..a33fb714fe7 100644 |
|
| 13 |
+--- a/Lib/test/test_imaplib.py |
|
| 14 |
+@@ -965,6 +965,9 @@ def test_logincapa(self): |
|
| 15 |
+ _server = self.imap_class(self.host, self.port) |
|
| 16 |
+ self.check_logincapa(_server) |
|
| 17 |
+ |
|
| 18 |
++ @unittest.skipIf(True, |
|
| 19 |
++ "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept " |
|
| 20 |
++ "our randomly generated client x509 certificate anymore") |
|
| 21 |
+ def test_logincapa_with_client_certfile(self): |
|
| 22 |
+ with transient_internet(self.host): |
|
| 23 |
+ with support.check_warnings(('', DeprecationWarning)):
|
|
| 24 |
+@@ -972,6 +975,9 @@ def test_logincapa_with_client_certfile(self): |
|
| 25 |
+ certfile=CERTFILE) |
|
| 26 |
+ self.check_logincapa(_server) |
|
| 27 |
+ |
|
| 28 |
++ @unittest.skipIf(True, |
|
| 29 |
++ "bpo-30175: FIXME: cyrus.andrew.cmu.edu doesn't accept " |
|
| 30 |
++ "our randomly generated client x509 certificate anymore") |
|
| 31 |
+ def test_logincapa_with_client_ssl_context(self): |
|
| 32 |
+ with transient_internet(self.host): |
|
| 33 |
+ _server = self.imap_class( |