Merge pull request #267 from zopefoundation/issue266

Fix ResourceWarnings seen during testing, and a testrunner orphaned thread warning

.coveragerc

@@ -11,3 +11,4 @@ exclude_lines =
     pragma: no cover
     if __name__ == ['"]__main__['"]:
     assert False
+    self.fail

doc/reference/storages.rst

@@ -131,6 +131,7 @@ Demo storages are configured using the ``demostorage`` section::
    'base.fs'
    >>> storage.changes.getName()
    'Changes'
+   >>> storage.close()
 
 ``demostorage`` sections can contain up to 2 storage subsections,
 named ``base`` and ``changes``, specifying the demo storage's base and

src/ZODB/scripts/repozo.py

@@ -667,9 +667,11 @@ def do_recover(options):
     repofiles = find_files(options)
     if not repofiles:
         if options.date:
-            raise NoFiles('No files in repository before %s', options.date)
+            raise NoFiles('No files in repository before %s' % (options.date,))
         else:
             raise NoFiles('No files in repository')
+
+    files_to_close = ()
     if options.output is None:
         log('Recovering file to stdout')
         outfp = sys.stdout
@@ -682,6 +684,9 @@ def do_recover(options):
         log('Recovering file to %s', options.output)
         temporary_output_file = options.output + '.part'
         outfp = open(temporary_output_file, 'wb')
+        files_to_close += (outfp,)
+
+    try:
         if options.withverify:
             datfile = os.path.splitext(repofiles[0])[0] + '.dat'
             with open(datfile) as fp:
@@ -724,9 +729,11 @@ def do_recover(options):
                 shutil.copyfile(source_index, target_index)
             else:
                 log('No index file to restore: %s', source_index)
+    finally:
+        for f in files_to_close:
+            f.close()
 
-    if outfp != sys.stdout:
-        outfp.close()
+    if options.output is not None:
         try:
             os.rename(temporary_output_file, options.output)
         except OSError:

src/ZODB/tests/testThreadedShutdown.py

@@ -7,6 +7,8 @@ import ZODB
 
 class ZODBClientThread(threading.Thread):
 
+    sleep_time = 15
+
     def __init__(self, db, test):
         threading.Thread.__init__(self)
         self._exc_info = None
@@ -19,7 +21,7 @@ class ZODBClientThread(threading.Thread):
         conn = self.db.open()
         conn.sync()
         self.event.set()
-        time.sleep(15)
+        time.sleep(self.sleep_time)
 
         # conn.close calls self.transaction_manager.unregisterSynch(self)
         # and this succeeds.
@@ -37,6 +39,9 @@ class ShutdownTest(ZODB.tests.util.TestCase):
             'ZODBTests.fs', create=1)
         self._db = ZODB.DB(self._storage)
 
+    def tearDown(self):
+        ZODB.tests.util.TestCase.tearDown(self)
+
     def check_shutdown(self):
         client_thread = ZODBClientThread(self._db, self)
         client_thread.start()
@@ -47,8 +52,11 @@ class ShutdownTest(ZODB.tests.util.TestCase):
         # have different contents.
         self._db.close()
 
-    def tearDown(self):
-        ZODB.tests.util.TestCase.tearDown(self)
+        # Be sure not to 'leak' the running thread; if it hasn't
+        # finished after this, something went very wrong
+        client_thread.join(client_thread.sleep_time + 10)
+        if client_thread.is_alive():
+            self.fail("Client thread failed to close connection")
 
 
 def test_suite():