Fixed bugs in doctest loading from non-module files. Added functional test.

1 files changed, 6 insertions, 1 deletions

diff --git a/nose/loader.py b/nose/loader.py
index 47d7c2c..66962e0 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -128,9 +128,14 @@ class TestLoader(unittest.TestLoader):
             tests = [test for test in
                      self.config.plugins.loadTestsFromFile(filename)]
             if tests:
+                # Plugins can yield False to indicate that they were
+                # unable to load tests from a file, but it was not an
+                # error -- the file just had no tests to load.
+                tests = filter(None, tests)
                 return self.suiteClass(tests)
             else:
-                open(filename, 'r').close() # trigger os error 
+                # Nothing was able to even try to load from this file
+                open(filename, 'r').close() # trigger os error
                 raise ValueError("Unable to load tests from file %s"
                                  % filename)
         except KeyboardInterrupt: