Commit e52ac513 authored by Jason Madden's avatar Jason Madden

Disable that failing test on 3.8b4 for now.

parent 412d59d0
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
from __future__ import absolute_import, print_function, division from __future__ import absolute_import, print_function, division
import unittest import unittest
import sys
import gevent.testing as greentest import gevent.testing as greentest
from gevent import core from gevent import core
...@@ -128,6 +129,12 @@ class TestWatchersDefault(TestWatchers): ...@@ -128,6 +129,12 @@ class TestWatchersDefault(TestWatchers):
"See https://ci.appveyor.com/project/denik/gevent/build/1.0.1380/job/lrlvid6mkjtyrhn5#L1103 " "See https://ci.appveyor.com/project/denik/gevent/build/1.0.1380/job/lrlvid6mkjtyrhn5#L1103 "
"It has also timed out, but only on Appveyor CPython 3.6; local CPython 3.6 does not. " "It has also timed out, but only on Appveyor CPython 3.6; local CPython 3.6 does not. "
"See https://ci.appveyor.com/project/denik/gevent/build/1.0.1414/job/yn7yi8b53vtqs8lw#L1523") "See https://ci.appveyor.com/project/denik/gevent/build/1.0.1414/job/yn7yi8b53vtqs8lw#L1523")
@greentest.skipIf(
greentest.LIBUV and greentest.RUNNING_ON_TRAVIS and sys.version_info == (3, 8, 0, 'beta', 4),
"Crashes on 3.8.0b4 on TravisCI. "
"(https://travis-ci.org/gevent/gevent/jobs/582031266#L215) "
"Unable to reproduce locally so far on macOS."
)
class TestWatchersDefaultDestroyed(TestWatchers): class TestWatchersDefaultDestroyed(TestWatchers):
def _makeOne(self): def _makeOne(self):
......
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
from gevent import monkey; monkey.patch_all() from gevent import monkey; monkey.patch_all()
import sys import sys
import os
import array import array
import socket import socket
import traceback
import time import time
import unittest import unittest
import gevent.testing as greentest
from functools import wraps from functools import wraps
from gevent import get_hub
import gevent.testing as greentest
from gevent.testing import six from gevent.testing import six
from gevent.testing import LARGE_TIMEOUT from gevent.testing import LARGE_TIMEOUT
from gevent.testing import support from gevent.testing import support
...@@ -34,8 +34,7 @@ class Thread(_Thread): ...@@ -34,8 +34,7 @@ class Thread(_Thread):
try: try:
return target(*args, **kwargs) return target(*args, **kwargs)
except: # pylint:disable=bare-except except: # pylint:disable=bare-except
traceback.print_exc() get_hub().throw(*sys.exc_info())
os._exit(2)
_Thread.__init__(self, target=errors_are_fatal, **kwargs) _Thread.__init__(self, target=errors_are_fatal, **kwargs)
self.start() self.start()
...@@ -91,18 +90,17 @@ class TestTCP(greentest.TestCase): ...@@ -91,18 +90,17 @@ class TestTCP(greentest.TestCase):
def accept_and_read(): def accept_and_read():
conn = None conn = None
r = None
try: try:
conn, _ = self.listener.accept() conn, _ = self.listener.accept()
r = conn.makefile(mode='rb') r = conn.makefile(mode='rb')
read_data.append(r.read()) read_data.append(r.read())
r.flush() r.flush()
r.close() r.close()
except: # pylint:disable=bare-except
server_exc_info.append(sys.exc_info())
finally: finally:
if conn: for f in (conn, r, self.listener):
conn.close() if f is not None:
self.listener.close() f.close()
server = Thread(target=accept_and_read) server = Thread(target=accept_and_read)
client = self.create_connection(**client_args) client = self.create_connection(**client_args)
...@@ -114,9 +112,10 @@ class TestTCP(greentest.TestCase): ...@@ -114,9 +112,10 @@ class TestTCP(greentest.TestCase):
client.close() client.close()
server.join() server.join()
assert not server.is_alive()
if match_data is None: if match_data is None:
match_data = self.long_data match_data = self.long_data
self.assertEqual(read_data[0], match_data) self.assertEqual(read_data, [match_data])
if server_exc_info: if server_exc_info:
six.reraise(*server_exc_info[0]) six.reraise(*server_exc_info[0])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment