[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog/tests - testCatalog.py:1.6.8.1 keywords.py:NONE loadmail.py:NONE testCatalogTiming.py:NONE

[Shane Hathaway]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog/tests
In directory cvs.zope.org:/tmp/cvs-serv29115/lib/python/Products/ZCatalog/tests

Modified Files:
      Tag: NR-branch
	testCatalog.py 
Removed Files:
      Tag: NR-branch
	keywords.py loadmail.py testCatalogTiming.py 
Log Message:
Sync NR-branch with trunk.  Sorry about so many checkin messages...


=== Zope/lib/python/Products/ZCatalog/tests/testCatalog.py 1.6 => 1.6.8.1 === (834/934 lines abridged)
+#!/usr/bin/env python
 
-"""
-    Testsuite for testing Catalogs
-    $Id$
-    
-    Andreas Jung, andreas@digicool.com
-    
-    $Log$
-    Revision 1.6  2001/06/15 14:09:57  andreas
-    some tweaks for Python 2.1, new ZCatalog/PluginIndexes infrastructure
+# Unittests for Catalog
 
-    Revision 1.5  2001/04/17 17:08:13  chrism
-    Merging into trunk.
-
-    Revision 1.1.6.5  2001/04/17 17:01:21  chrism
-    More tests.
-
-    Revision 1.1.6.4.2.1  2001/04/17 06:39:45  chrism
-    added further tests for catalog object in test_suite.
-
-    Revision 1.1.6.4  2001/04/05 16:18:05  chrism
-    Added test for empty mapping returns all.
-
-    Revision 1.4  2001/04/05 16:15:36  chrism
-    added test for empty mapping returns all.
-
-    Revision 1.3  2001/03/23 23:34:14  chrism
-    Merge from branch.
-
-    Revision 1.1.6.3  2001/03/23 23:32:02  chrism
-    Added catalog length test.
-
-    Revision 1.1.6.2  2001/03/23 19:38:52  chrism
-    added checkUncatalogTwice test.
-
-    Revision 1.1.6.1  2001/03/15 13:10:32  jim
-    Merged changes from Catalog-BTrees-Integration branch.
-
-    Revision 1.1.4.11  2001/03/14 18:43:16  andreas
-    rearranged source code
-
-    Revision 1.1.4.10  2001/03/14 15:12:24  andreas
-    minor changes
-
-    Revision 1.1.4.9  2001/03/13 22:45:07  andreas
-    yet another try/except clause (zope mbox file seems to contain some sloppy
-    messages)
-

[-=- -=- -=- 834 lines omitted -=- -=- -=-]

-         testSearches("testKeywordRangeIndex",numThreads= 1)
-    )
-
-    bench1_tests = (
-         testSearches("testFulltextIndex",numThreads=1),
-         testSearches("testFulltextIndex",numThreads= 4),
-         testSearches("testFieldIndex",numThreads= 1),
-         testSearches("testFieldIndex",numThreads= 4),
-         testSearches("testFieldRangeIndex",numThreads=1),
-         testSearches("testFieldRangeIndex",numThreads= 4),
-         testSearches("testKeywordIndex",numThreads= 1),
-         testSearches("testKeywordIndex",numThreads= 4),
-         testSearches("testKeywordRangeIndex",numThreads= 1),
-         testSearches("testKeywordRangeIndex",numThreads=4)
-    )
-
-    bench2_tests = (
-#       testSearches("testReindexing",numThreads=1),
-#        testSearches("testIncrementalIndexing",numThreads=1),
-        testSearches("testUpdates",numThreads=2,numUpdates=200),
-#        testSearches("testUpdates",numThreads=4,numUpdates=200)
-    )
-
-    exp_tests = (
-#        testRS("testRangeSearch"),
-#       testSearches("testReindexing",numThreads=1),
-         testSearches("testReindexingAndModify",numThreads=1),
-#        testSearches("testUpdates",numThreads=10,numUpdates=100),
-    )
-            
-    init_tests = ( 
-        BuildEnv("buildTestEnvironment",dataDir,maxFiles) ,
-    )
-
-    if what=='basic':    
-        ts = unittest.TestSuite(ts_cm)
-#        for x in t_aj: ts.addTest(x)
-        return ts
-
-    else:
-        ts = unittest.TestSuite()
-        for x in eval('%s_tests' % what): ts.addTest(x)
-        return ts
-
-    return
-
+    return unittest.TestSuite(ts_cm)
 
 
 def pdebug():

=== Removed File Zope/lib/python/Products/ZCatalog/tests/keywords.py ===

=== Removed File Zope/lib/python/Products/ZCatalog/tests/loadmail.py ===

=== Removed File Zope/lib/python/Products/ZCatalog/tests/testCatalogTiming.py ===