#17082: merge with 3.3.

diff --cc Lib/test/test_dbm.py
Simple merge

diff --cc Misc/NEWS
index 1c5f3b395bbc67ffedcd1a6d5ee39c9f762d68f0,91c415344f0691118dc91e44bb1a85442f81d4fa..57470e55fcef4031e3af4e6023dca31dcca65389
--- 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 #17082: test_dbm* now work with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17079: test_ctypes now works with unittest test discovery.
    Patch by Zachary Ware.