Appveyor fixes.

src/gevent/testing/patched_tests_setup.py

@@ -245,6 +245,14 @@ disabled_tests = [
     'test_context.ContextTest.test_context_var_new_2',
 ]
 
+
+if sys.version_info[:3] < (2, 7, 18):
+    # The final release was 2.7.18. It added some new tests for new
+    # fixes. At this writing, AppVeyor is still on 2.7.17.
+    disabled_tests += [
+        'test_urllib2.MiscTests.test_url_host_with_control_char_rejected',
+    ]
+
 if OSX:
     disabled_tests += [
         # These are timing dependent, and sometimes run into the OS X
@@ -1336,14 +1344,16 @@ if PY39:
         'test_subprocess.POSIXProcessTestTest.test_send_signal_race',
     ]
 
-    # These were added for fixes sometime between 3.9.1 and 3.9.5
     if sys.version_info[:3] < (3, 9, 5):
         disabled_tests += [
+            # These were added for fixes sometime between 3.9.1 and 3.9.5
             'test_ftplib.TestFTPClass.test_makepasv_issue43285_security_disabled',
             'test_ftplib.TestFTPClass.test_makepasv_issue43285_security_enabled_default',
             'test_httplib.BasicTest.test_dir_with_added_behavior_on_status',
             'test_httplib.TunnelTests.test_tunnel_connect_single_send_connection_setup',
             'test_ssl.TestSSLDebug.test_msg_callback_deadlock_bpo43577',
+            # This one times out on 3.7.1 on Appveyor
+            'test_ftplib.TestTLS_FTPClassMixin.test_retrbinary_rest',
         ]
 
 if TRAVIS:
@@ -1359,6 +1369,7 @@ if TRAVIS:
 
     ]
 
+
 # Now build up the data structure we'll use to actually find disabled tests
 # to avoid a linear scan for every file (it seems the list could get quite large)
 # (First, freeze the source list to make sure it isn't modified anywhere)

src/gevent/tests/test___monkey_patching.py

@@ -54,8 +54,11 @@ def TESTRUNNER(tests=None):
 
     PYTHONPATH = (os.getcwd() + os.pathsep + get_absolute_pythonpath()).rstrip(':')
 
-    tests = [os.path.basename(x) for x in tests]
-    version_tests = [os.path.basename(x) for x in version_tests]
+    tests = sorted(set(os.path.basename(x) for x in tests))
+    version_tests = sorted(set(os.path.basename(x) for x in version_tests))
+
+    util.log("Discovered %d tests in %s", len(tests), test_dir)
+    util.log("Discovered %d version-specific tests in %s", len(version_tests), version_test_dir)
 
     options = {
         'cwd': test_dir,