Closes #22173: Merge with 3.4

diff --cc Misc/NEWS
index b27e936fbbb58b37574ad6c979a90e44231628ed,20938600da88d4fbb5967fc068006874a90c89bc..a6c563e3ab846e55c3b1896906df6142a3bb5dee
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -1235,58 -911,6 +1235,60 @@@ Documentatio
  Tests
  -----
  
++- Issue #22173: Update lib2to3 tests to use unittest test discovery.
++
 +- Issue #20746: Fix test_pdb to run in refleak mode (-R).  Patch by Xavier
 +  de Gaye.
 +
 +- Issue #22060: test_ctypes has been somewhat cleaned up and simplified; it
 +  now uses unittest test discovery to find its tests.
 +
 +- Issue #22104: regrtest.py no longer holds a reference to the suite of tests
 +  loaded from test modules that don't define test_main().
 +
 +- Issue #22111: Assorted cleanups in test_imaplib.  Patch by Milan Oberkirch.
 +
 +- Issue #22002: Added ``load_package_tests`` function to test.support and used
 +  it to implement/augment test discovery in test_asyncio, test_email,
 +  test_importlib, test_json, and test_tools.
 +
 +- Issue #21976: Fix test_ssl to accept LibreSSL version strings.  Thanks
 +  to William Orr.
 +
 +- Issue #21918: Converted test_tools from a module to a package containing
 +  separate test files for each tested script.
 +
 +- Issue #9554: Use modern unittest features in test_argparse. Initial patch by
 +  Denver Coneybeare and Radu Voicilas.
 +
 +- Issue #20155: Changed HTTP method names in failing tests in test_httpservers
 +  so that packet filtering software (specifically Windows Base Filtering Engine)
 +  does not interfere with the transaction semantics expected by the tests.
 +
 +- Issue #19493: Refactored the ctypes test package to skip tests explicitly
 +  rather than silently.
 +
 +- Issue #18492: All resources are now allowed when tests are not run by
 +  regrtest.py.
 +
 +- Issue #21634: Fix pystone micro-benchmark: use floor division instead of true
 +  division to benchmark integers instead of floating point numbers. Set pystone
 +  version to 1.2. Patch written by Lennart Regebro.
 +
 +- Issue #21605: Added tests for Tkinter images.
 +
 +- Issue #21493: Added test for ntpath.expanduser().  Original patch by
 +  Claudiu Popa.
 +
 +- Issue #19925: Added tests for the spwd module. Original patch by Vajrasky Kok.
 +
 +- Issue #21522: Added Tkinter tests for Listbox.itemconfigure(),
 +  PanedWindow.paneconfigure(), and Menu.entryconfigure().
 +
 +- Issue #17756: Fix test_code test when run from the installed location.
 +
 +- Issue #17752: Fix distutils tests when run from the installed location.
 +
  - Issue #18604: Consolidated checks for GUI availability.  All platforms now
    at least check whether Tk can be instantiated when the GUI resource is
    requested.