bpo-33522: Enable CI builds on Visual Studio Team Services (GH-6865) (GH-6926)

(cherry picked from commit e5f41d2f1e0b8b8e61d5fa427c19bd1ea90fd9a3)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>
diff --git a/Lib/test/test_bdb.py b/Lib/test/test_bdb.py
index bda74a2..616c3a8 100644
--- a/Lib/test/test_bdb.py
+++ b/Lib/test/test_bdb.py
@@ -417,15 +417,17 @@
         self.dry_run = test_case.dry_run
         self.tracer = Tracer(test_case.expect_set, skip=skip,
                              dry_run=self.dry_run, test_case=test_case.id())
+        self._original_tracer = None
 
     def __enter__(self):
         # test_pdb does not reset Breakpoint class attributes on exit :-(
         reset_Breakpoint()
+        self._original_tracer = sys.gettrace()
         return self.tracer
 
     def __exit__(self, type_=None, value=None, traceback=None):
         reset_Breakpoint()
-        sys.settrace(None)
+        sys.settrace(self._original_tracer)
 
         not_empty = ''
         if self.tracer.set_list: