merge pull request #27: correctly handle nose.SkipTest during collection. Thanks

Antonio Cuni, Ronny Pfannschmidt.  I did a few tweaks to the test and the
activation (depending on if unittest is imported at all).

1 files changed, 6 insertions, 0 deletions

diff --git a/_pytest/main.py b/_pytest/main.py
index 2d1152423..cde683b47 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -10,6 +10,7 @@ except ImportError:
     from UserDict import DictMixin as MappingMixin
 
 from _pytest.mark import MarkInfo
+import _pytest.runner
 
 tracebackcutdir = py.path.local(_pytest.__file__).dirpath()
 
@@ -368,6 +369,11 @@ class Collector(Node):
     """ Collector instances create children through collect()
         and thus iteratively build a tree.
     """
+
+    # the set of exceptions to interpret as "Skip the whole module" during
+    # collection
+    skip_exceptions = (_pytest.runner.Skipped,)
+    
     class CollectError(Exception):
         """ an error during collection, contains a custom message. """