[Zope3-checkins] SVN: zope.testing/trunk/src/zope/testing/testrunner.py Oops. The code from the test-fu branch was accidentally merged into trunk

[Marius Gedminas]

Log message for revision 71991:
  Oops.  The code from the test-fu branch was accidentally merged into trunk
  without its corresponding testcase.  Revert the chunk.
  
  

Changed:
  U   zope.testing/trunk/src/zope/testing/testrunner.py

-=-
Modified: zope.testing/trunk/src/zope/testing/testrunner.py
===================================================================
--- zope.testing/trunk/src/zope/testing/testrunner.py	2007-01-12 23:19:40 UTC (rev 71990)
+++ zope.testing/trunk/src/zope/testing/testrunner.py	2007-01-12 23:23:45 UTC (rev 71991)
@@ -1826,13 +1826,6 @@
     if options.all:
         options.at_level = sys.maxint
 
-    if options.unit and options.non_unit:
-        # The test runner interpets this as "run only those tests that are both
-        # unit and non-unit at the same time".  The user, however, wants to run
-        # both unit and non-unit tests.  Disable the filtering so that the user
-        # will get what she wants:
-        options.unit = options.non_unit = False
-
     if options.unit:
         options.layer = ['unit']
     if options.layer: