Changeset 1018
- Timestamp:
- 03/27/06 01:31:36
- Files:
-
- trunk/cherrypy/_cptree.py (modified) (1 diff)
- trunk/cherrypy/test/helper.py (modified) (1 diff)
- trunk/cherrypy/test/test.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cptree.py
r970 r1018 23 23 if "/" not in m: 24 24 import cherrypy 25 if not isinstance(cherrypy.root, Root):25 if cherrypy.root is not None and not isinstance(cherrypy.root, Root): 26 26 m["/"] = cherrypy.root 27 27 return m trunk/cherrypy/test/helper.py
r1017 r1018 4 4 "test.py" (in this folder); test.py calls this module as a library. 5 5 6 Usage: 7 Each individual test_*.py module imports this module (helper), 8 usually to make an instance of CPWebCase, and then call testmain(). 9 10 The CP test suite script (test.py) imports this module and calls 11 run_test_suite, possibly more than once. CP applications may also 12 import test.py (to use TestHarness), which then calls helper.py. 6 Usage 7 ===== 8 Each individual test_*.py module imports this module (helper), 9 usually to make an instance of CPWebCase, and then call testmain(). 10 11 The CP test suite script (test.py) imports this module and calls 12 run_test_suite, possibly more than once. CP applications may also 13 import test.py (to use TestHarness), which then calls helper.py. 13 14 """ 14 15 trunk/cherrypy/test/test.py
r1017 r1018 254 254 255 255 if self.profile: 256 conf = conf or {} 256 257 conf['profiling.on'] = True 257 258

