#17079: merge with 3.3.

diff --cc Misc/NEWS
index 9e284515a6a4ea66ab73e1fa1948c67d60c297cf,3149f90852244f297257d75f47f9240e888c40d6..1c5f3b395bbc67ffedcd1a6d5ee39c9f762d68f0
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -894,8 -644,9 +894,11 @@@ Test
  
  - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #17079: test_ctypes now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17304: test_hash now works with unittest test discovery.
    Patch by Zachary Ware.