Fix checking for failing configuration.

src/gevent/testing/skipping.py

@@ -32,6 +32,8 @@ def _do_not_skip(reason):
     return _identity
 
 
+skipOnMac = _do_not_skip
+skipOnMacOnCI = _do_not_skip
 skipOnWindows = _do_not_skip
 skipOnAppVeyor = _do_not_skip
 skipOnCI = _do_not_skip
@@ -62,6 +64,8 @@ skipOnLibev = _do_not_skip
 if sysinfo.WIN:
     skipOnWindows = unittest.skip
 
+if sysinfo.OSX:
+    skipOnMac = unittest.skip
 
 if sysinfo.RUNNING_ON_APPVEYOR:
     # See comments scattered around about timeouts and the timer
@@ -76,6 +80,8 @@ if sysinfo.RUNNING_ON_APPVEYOR:
 
 if sysinfo.RUNNING_ON_CI:
     skipOnCI = unittest.skip
+    if sysinfo.OSX:
+        skipOnMacOnCI = unittest.skip
 
 if sysinfo.RUNNING_ON_MANYLINUX:
     skipOnManylinux = unittest.skip

src/gevent/testing/testrunner.py

@@ -431,7 +431,7 @@ class Discovery(object):
                 cmd = self.__begin_command()
                 cmd.append('-m')
                 cmd.append('unittest')
-                cmd.append('-v')
+                # cmd.append('-v')
                 for name in group:
                     cmd.append(name)
                 self.commands.insert(0, (cmd, DEFAULT_RUN_OPTIONS.copy()))
@@ -537,6 +537,8 @@ def matches(possibilities, command, include_flaky=True):
         # XXX: This could be much better. Our command needs better structure.
         if command.endswith(' ' + line) or command.endswith(line.replace(".py", '')):
             return True
+        if ' '  not in command and command == line:
+            return True
     return False
 
 

src/gevent/tests/known_failures.py

@@ -452,7 +452,7 @@ class Definitions(DefinitionsBase):
 
     test__refcount = Ignored(
         "Sometimes fails to connect for no reason",
-        when=(CI & OSX) | (CI & PYPY),
+        when=(CI & OSX) | (CI & PYPY) | APPVEYOR,
         ignore_coverage=PYPY
     )
 

src/gevent/tests/test__socket.py

@@ -22,6 +22,7 @@ from gevent.testing import support
 from gevent.testing import params
 from gevent.testing.sockets import tcp_listener
 from gevent.testing.skipping import skipWithoutExternalNetwork
+from gevent.testing.skipping import skipOnMacOnCI
 
 # we use threading on purpose so that we can test both regular and
 # gevent sockets with the same code
@@ -49,7 +50,6 @@ class Thread(_Thread):
 
 
 class TestTCP(greentest.TestCase):
-    maxDiff = None
     __timeout__ = None
     TIMEOUT_ERROR = socket.timeout
     long_data = ", ".join([str(x) for x in range(20000)])
@@ -221,6 +221,7 @@ class TestTCP(greentest.TestCase):
         def test_sendall_unicode(self):
             self._test_sendall(six.text_type(self.long_data))
 
+    @skipOnMacOnCI("Sometimes fails for no apparent reason (buffering?)")
     def test_sendall_array(self):
         data = array.array("B", self.long_data)
         self._test_sendall(data)