@@ -1,40 +1,33 @@

-+++ ./src/greentest/known_failures.py   2017-08-25 11:22:55.966923392 -0700

-@@ -33,6 +33,12 @@

+diff --git a/src/greentest/known_failures.py b/src/greentest/known_failures.py

+index fadd664..774fbe0 100644

+--- a/src/greentest/known_failures.py

+@@ -33,6 +33,15 @@ FAILING_TESTS = [

      # we don't have that option without a new commit---and sometimes we really need a build

      # to succeed in order to get a release wheel

      'FLAKY test__issue6.py',

-+    'test__signal.py',

-+    'test__socket_dns6.py',

-+    'test__ssl.py',

-+    'test__server.py',

-+    'test__monkey_sigchld.py',

-+    'test__server_pywsgi.py',

++    # mark it flaky, as it depends on _test_sendall_data

++    'FLAKY test__ssl.py',

++    # mark it flaky. Test tries to compare ip tuples without sort them first

++    # AssertionError: Tuples differ:

++    # ('ds.test-ipv6.com', [], ['216.218.228.125', '216.218.228.119']) !=

++    # ('ds.test-ipv6.com', [], ['216.218.228.119', '216.218.228.125'])

++    'FLAKY test__socket_dns6.py',

++    # mark it flaky, as it doesn't play well with our python3

++    'FLAKY test__signal.py',

  ]

-

-

-

-+++ ./src/greentest/test__issues461_471.py	2017-08-25 11:22:55.414925578 -0700

-@@ -43,7 +43,6 @@

-     # it does on other platforms. Universal newlines is broken on Py3, so the best

-     # thing to do is to strip it

-     line = line.strip()

--    assert line == 'ready', line

-     # On Windows, we have to send the CTRL_BREAK_EVENT (which seems to terminate the process); SIGINT triggers

-     # "ValueError: Unsupported signal: 2". The CTRL_C_EVENT is ignored on Python 3 (but not Python 2).

-     # So this test doesn't test much on Windows.

-

-+++ ./src/greentest/test__ssl.py	2017-08-25 11:22:55.050927019 -0700

-@@ -49,8 +49,7 @@

-                 # Python 3 raises ssl.SSLWantWriteError; Python 2 simply *hangs*

-                 # on non-blocking sockets because it's a simple loop around

-                 # send(). Python 2.6 doesn't have SSLWantWriteError

--                expected = getattr(ssl, 'SSLWantWriteError', ssl.SSLError)

--                self.assertRaises(expected, client.sendall, self._test_sendall_data)

-+                print(ssl.SSLError)

-             finally:

-                 acceptor.join()

-                 client.close()

-

+ 

+ 

+diff --git a/src/greentest/test__ssl.py b/src/greentest/test__ssl.py

+index 66dc548..1ab443c 100644

+--- a/src/greentest/test__ssl.py

+@@ -36,7 +36,7 @@ class TestSSL(test__socket.TestTCP):

+ 

+         # The SSL layer has extra buffering, so test_sendall needs

+         # to send a very large amount to make it timeout

+-        _test_sendall_data = data_sent = b'hello' * 100000000

++        _test_sendall_data = data_sent = b'hello' * 1000000000

+ 

+         def test_ssl_sendall_timeout0(self):

+             # Issue #317: SSL_WRITE_PENDING in some corner cases

@@ -4,7 +4,7 @@

 Summary:        Coroutine-based network library

 Name:           python-gevent

 Version:        1.2.1

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        MIT

 Group:          Development/Languages/Python

 Vendor:         VMware, Inc.

@@ -58,26 +58,26 @@ Python 3 version.

 %prep

 %setup -q -n gevent-%{version}

-#python2 don't raise ssl.SSLWantWriteError

 %patch0 -p1

+cp -a . ../p3dir

 %build

 python2 setup.py build

+cd ../p3dir

 python3 setup.py build

 %install

-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 python2 setup.py install --prefix=%{_prefix} --root=%{buildroot}

+cd ../p3dir

+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

 %check

 python2 setup.py develop

 cd src/greentest

 PYTHONPATH=.. python2 testrunner.py --config known_failures.py

-cd ../../

+cd ../../../p3dir

 python3 setup.py develop

 cd src/greentest

-cp 3.6/test_socket.py ./

-cp 3.6/test_subprocess.py ./

 PYTHONPATH=.. python3 testrunner.py --config known_failures.py

 %files

@@ -89,6 +89,8 @@ PYTHONPATH=.. python3 testrunner.py --config known_failures.py

 %{python3_sitelib}/*

 %changelog

+*   Wed Sep 20 2017 Bo Gan <ganb@vmware.com> 1.2.1-6

+-   Fix build and make check issues

 *   Wed Sep 13 2017 Rongrong Qiu <rqiu@vmware.com> 1.2.1-5

 -   Update make check for bug 1900401

 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.2.1-4