Michael Foord avatar Michael Foord committed fcf7c42

Check lib directory before src directory in test discovery

Comments (0)

Files changed (1)

unittest2/loader.py

         lib_dir = check_dir('lib')
         tests = list(self._find_tests(start_dir, pattern))
         real_top_level = self._top_level_dir
+        if lib_dir is not None:
+            self._top_level_dir = lib_dir
+            tests.extend(list(self._find_tests(lib_dir, pattern)))
         if src_dir is not None:
             self._top_level_dir = src_dir
             tests.extend(list(self._find_tests(src_dir, pattern)))
-        if lib_dir is not None:
-            self._top_level_dir = lib_dir
-            tests.extend(list(self._find_tests(lib_dir, pattern)))
         if implicit_start:
             for entry in os.listdir(start_dir):
                 if not 'test' in entry.lower():
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.