[Checkins] SVN: z3c.testsetup/trunk/ Undoing Plone support. This will go to a separate package.

[Uli Fouquet]

Log message for revision 84470:
  Undoing Plone support. This will go to a separate package.

Changed:
  U   z3c.testsetup/trunk/CHANGES.txt
  U   z3c.testsetup/trunk/buildout.cfg
  U   z3c.testsetup/trunk/setup.py
  D   z3c.testsetup/trunk/src/z3c/testsetup/plone/
  U   z3c.testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py

-=-
Modified: z3c.testsetup/trunk/CHANGES.txt
===================================================================
--- z3c.testsetup/trunk/CHANGES.txt	2008-03-05 01:28:50 UTC (rev 84469)
+++ z3c.testsetup/trunk/CHANGES.txt	2008-03-05 01:39:42 UTC (rev 84470)
@@ -4,12 +4,7 @@
 0.2.3 (unreleased)
 ==================
 
-Feature Changes
----------------
 
-* Added experimental support for test setups with plone.
-
-
 0.2.2 (2008-02-29)
 ==================
 

Modified: z3c.testsetup/trunk/buildout.cfg
===================================================================
--- z3c.testsetup/trunk/buildout.cfg	2008-03-05 01:28:50 UTC (rev 84469)
+++ z3c.testsetup/trunk/buildout.cfg	2008-03-05 01:39:42 UTC (rev 84470)
@@ -1,36 +1,8 @@
 [buildout]
 develop = .
-parts = plone zope2 instance test
-find-links =
-	http://download.zope.org/distribution/
-        http://download.zope.org/distribution/
-        http://effbot.org/downloads
-eggs = elementtree
+parts = test
+find-links = http://download.zope.org/distribution/
 
-[plone]
-recipe = plone.recipe.plone
-
-[zope2]
-recipe = plone.recipe.zope2install
-url = ${plone:zope2-url}
-
-[instance]
-recipe = plone.recipe.zope2instance
-zope2-location = ${zope2:location}
-user = admin:admin
-http-port = 8080
-debug-mode = on
-verbose-security = on
-eggs =
-     ${plone:eggs}
-     ${buildout:eggs}
-     z3c.testsetup
-zcml = z3c.testsetup.plone.cave
-products =
-    ${plone:products}
-
-#    src/z3c/testsetup/plone/cave
-
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.testsetup [test,]

Modified: z3c.testsetup/trunk/setup.py
===================================================================
--- z3c.testsetup/trunk/setup.py	2008-03-05 01:28:50 UTC (rev 84469)
+++ z3c.testsetup/trunk/setup.py	2008-03-05 01:39:42 UTC (rev 84470)
@@ -7,7 +7,6 @@
 tests_require = [
     'zope.app.testing',
     'zope.component',
-    'elementtree',
     ]
 
 long_description = (

Modified: z3c.testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py
===================================================================
--- z3c.testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-03-05 01:28:50 UTC (rev 84469)
+++ z3c.testsetup/trunk/src/z3c/testsetup/tests/test_testsetup.py	2008-03-05 01:39:42 UTC (rev 84470)
@@ -3,7 +3,6 @@
 import gc
 import re
 import unittest
-from subprocess import Popen, PIPE
 from zope.testing import doctest, cleanup, renormalizing
 import zope.component.eventtesting
 from z3c.testsetup.util import get_package
@@ -45,10 +44,8 @@
     basenames = [os.path.basename(x) for x in get_filenames_from_suite(suite)]
     basenames.sort()
     return basenames
+    
 
-def get_output_from_cmd(*args):
-    return Popen(args, stdout=PIPE, stderr=PIPE).communicate()[0]
-
 def setUpZope(test):
     zope.component.eventtesting.setUp(test)
 
@@ -109,43 +106,9 @@
     suite.addTest(test)
     return suite
 
-def plone_suite():
-    def setUp(test):
-        test.globs['saved-sys-info'] = (
-            sys.path[:],
-            sys.argv[:],
-            sys.modules.copy(),
-            gc.get_threshold(),
-            )
-        test.globs['this_directory'] = os.path.split(__file__)[0]
-        test.globs['testrunner_script'] = __file__
-        test.globs['get_basenames_from_suite'] = get_basenames_from_suite
-        test.globs['get_output_from_cmd'] = get_output_from_cmd
-
-    def tearDown(test):
-        sys.path[:], sys.argv[:] = test.globs['saved-sys-info'][:2]
-        gc.set_threshold(*test.globs['saved-sys-info'][3])
-        sys.modules.clear()
-        sys.modules.update(test.globs['saved-sys-info'][2])
-    suites = [
-        doctest.DocFileSuite(
-            os.path.join('plone', 'README.txt'),
-            package='z3c.testsetup',
-            setUp=setUp, tearDown=tearDown,
-            optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
-            checker=checker),
-        ]
-
-    suite = unittest.TestSuite(suites)
-    return suite
-
 def test_suite():
     suite = unittest.TestSuite()
     for name in TESTFILES:
-        suite.addTests(suiteFromFile(name))
+        suite.addTest(suiteFromFile(name))
     suite.addTest(testrunner_suite())
-    if not '--ignore_dir=plone' in sys.argv:
-        if sys.version_info[0] == 2 and sys.version_info[1] < 5:
-            # Skip Plone tests if Python < 2.5
-            suite.addTests(plone_suite())
     return suite