Provide discovery-only version of nose2.main (nose2.discover) [Fixes n…

…ose-devs#32]

nose2.main is now analagous to unittest.main -- for use in single modules.
nose2.discover is analagous to unit2 discover and is now called by the
nose2 command line script and setuptools scripts.

bin/nose2

@@ -2,6 +2,6 @@
 
 __unittest = True
 
-from nose2.main import main_
+from nose2 import discover
 
-main_()
+discover()

nose2/__init__.py

@@ -1 +1 @@
-from nose2.main import main_
+from nose2.main import discover, main

nose2/__main__.py

@@ -6,5 +6,5 @@
 
 __unittest = True
 
-from nose2.main import main_
-main_()
+from nose2 import discover
+discover()

nose2/main.py

@@ -215,10 +215,6 @@ def loadPlugins(self):
 
     def createTests(self):
         """Create top-level test suite"""
-        # XXX belongs in init?
-        if self.module and '__unittest' in dir(self.module):
-            self.module = None
-
         event = events.CreateTestsEvent(
            self.testLoader, self.testNames, self.module)
         result = self.session.hooks.createTests(event)
@@ -244,4 +240,9 @@ def _makeRunner(self):
         return event.runner
 
 
-main_ = PluggableTestProgram
+main = PluggableTestProgram
+
+
+def discover(*args, **kwargs):
+    kwargs['module'] = None
+    return main(*args, **kwargs)

nose2/tests/_common.py

@@ -3,12 +3,11 @@
 import tempfile
 import shutil
 import sys
-import subprocess
 
 import six
 
 from nose2.compat import unittest
-from nose2 import main, util
+from nose2 import discover, util
 
 
 HERE = os.path.abspath(os.path.dirname(__file__))
@@ -167,7 +166,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
     def communicate(self):
         with self:
             try:
-                self.result = main.PluggableTestProgram(
+                self.result = discover(
                     argv=('nose2',) + self.args, exit=False,
                     **self.kwargs)
             except SystemExit as e:

setup.py

@@ -64,8 +64,8 @@
 
     params['entry_points'] = {
         'console_scripts': [
-            '%s = nose2:main_' % SCRIPT1,
-            '%s = nose2:main_' % SCRIPT2,
+            '%s = nose2:discover' % SCRIPT1,
+            '%s = nose2:discover' % SCRIPT2,
         ],
     }
     params['install_requires'] = REQS