Commit 4a8062bd authored by Jason Madden's avatar Jason Madden

More Appveyor fixes

Plus a PyPy fix, now that the tests are running again.
parent 273c3207
...@@ -56,7 +56,12 @@ class _Callbacks(AbstractCallbacks): ...@@ -56,7 +56,12 @@ class _Callbacks(AbstractCallbacks):
# pylint:disable=arguments-differ,arguments-renamed # pylint:disable=arguments-differ,arguments-renamed
def python_check_callback(self, *args): def python_check_callback(self, *args):
pass # There's a pylint bug (pylint 2.9.3, astroid 2.6.2) that causes pylint to crash
# with an AttributeError on certain types of arguments-differ errors
# But code in _ffi/loop depends on being able to find the watcher_ptr
# argument is the local frame.
# pylint:disable=unused-variable
_loop, watcher_ptr, _events = args
def python_prepare_callback(self, _loop_ptr, watcher_ptr, _events): def python_prepare_callback(self, _loop_ptr, watcher_ptr, _events):
AbstractCallbacks.python_prepare_callback(self, watcher_ptr) AbstractCallbacks.python_prepare_callback(self, watcher_ptr)
......
...@@ -1352,6 +1352,8 @@ if PY39: ...@@ -1352,6 +1352,8 @@ if PY39:
'test_httplib.BasicTest.test_dir_with_added_behavior_on_status', 'test_httplib.BasicTest.test_dir_with_added_behavior_on_status',
'test_httplib.TunnelTests.test_tunnel_connect_single_send_connection_setup', 'test_httplib.TunnelTests.test_tunnel_connect_single_send_connection_setup',
'test_ssl.TestSSLDebug.test_msg_callback_deadlock_bpo43577', 'test_ssl.TestSSLDebug.test_msg_callback_deadlock_bpo43577',
# This one fails with the updated certs
'test_ssl.ContextTests.test_load_verify_cadata',
# This one times out on 3.7.1 on Appveyor # This one times out on 3.7.1 on Appveyor
'test_ftplib.TestTLS_FTPClassMixin.test_retrbinary_rest', 'test_ftplib.TestTLS_FTPClassMixin.test_retrbinary_rest',
] ]
......
...@@ -536,12 +536,16 @@ class Discovery(object): ...@@ -536,12 +536,16 @@ class Discovery(object):
self.__add_test(qualified_name, filename, contents) self.__add_test(qualified_name, filename, contents)
def visit_files(self, filenames): def visit_files(self, filenames):
print("\tBegin visit")
for filename in filenames: for filename in filenames:
print("\tVisiting", filename)
self.visit_file(filename) self.visit_file(filename)
with Discovery._in_dir(self.orig_dir): with Discovery._in_dir(self.orig_dir):
self.__expand_imports() self.__expand_imports()
self.__combine_commands(self.std_monkey_patch_files) self.__combine_commands(self.std_monkey_patch_files)
self.__combine_commands(self.no_monkey_patch_files) self.__combine_commands(self.no_monkey_patch_files)
print("\tCommands", self.commands)
print("\tEnd visit")
@staticmethod @staticmethod
@contextmanager @contextmanager
......
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