Changeset 1389
- Timestamp:
- 10/03/06 21:19:15
- Files:
-
- trunk/cherrypy/test/modpy.py (modified) (1 diff)
- trunk/cherrypy/test/test.py (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/test/modpy.py
r1345 r1389 134 134 webtest.WebCase.harness = self 135 135 webtest.WebCase.scheme = "http" 136 webtest.WebCase.interactive = self.interactive 136 137 print 137 138 print "Running tests:", self.server trunk/cherrypy/test/test.py
r1377 r1389 23 23 24 24 def __init__(self, tests=None, server=None, protocol="HTTP/1.1", 25 port=8000, scheme="http" ):25 port=8000, scheme="http", interactive=True): 26 26 """Constructor to populate the TestHarness instance. 27 27 … … 33 33 self.port = port 34 34 self.scheme = scheme 35 self.interactive = interactive 35 36 36 37 def run(self, conf=None): … … 73 74 webtest.WebCase.harness = self 74 75 helper.CPWebCase.scheme = self.scheme 76 webtest.WebCase.interactive = self.interactive 75 77 if self.scheme == "https": 76 78 webtest.WebCase.HTTP_CONN = httplib.HTTPSConnection … … 94 96 server = None 95 97 basedir = None 98 interactive = True 96 99 97 100 def __init__(self, available_tests, args=sys.argv[1:]): … … 105 108 self.available_tests = available_tests 106 109 107 longopts = ['cover', 'profile', 'validate', '1.0', 'ssl', 'help', 110 longopts = ['cover', 'profile', 'validate', 'dumb', 111 '1.0', 'ssl', 'help', 108 112 'basedir=', 'port=', 'server='] 109 113 longopts.extend(self.available_tests) … … 127 131 elif o == "--validate": 128 132 self.validate = True 133 elif o == "--dumb": 134 self.interactive = False 129 135 elif o == "--1.0": 130 136 self.protocol = "HTTP/1.0" … … 161 167 print """CherryPy Test Program 162 168 Usage: 163 test.py --server=* --port=%s --1.0 --cover --basedir=path --profile --validate -- tests**169 test.py --server=* --port=%s --1.0 --cover --basedir=path --profile --validate --dumb --tests** 164 170 165 171 """ % self.__class__.port … … 181 187 --profile: turn on profiling tool 182 188 --validate: use wsgiref.validate (builtin in Python 2.5). 189 --dumb: turn off the interactive output features. 183 190 """ % self.__class__.port 184 191 … … 293 300 from cherrypy.test import modpy 294 301 h = modpy.ModPythonTestHarness(self.tests, self.server, 295 self.protocol, self.port) 302 self.protocol, self.port, 303 "http", self.interactive) 296 304 h.use_wsgi = False 297 305 elif self.server == 'modpygw': 298 306 from cherrypy.test import modpy 299 307 h = modpy.ModPythonTestHarness(self.tests, self.server, 300 self.protocol, self.port) 308 self.protocol, self.port, 309 "http", self.interactive) 301 310 h.use_wsgi = True 302 311 else: 303 312 h = TestHarness(self.tests, self.server, self.protocol, 304 self.port, self.scheme )313 self.port, self.scheme, self.interactive) 305 314 306 315 h.run(conf) … … 348 357 'test_wsgi_ns', 349 358 ] 350 CommandLineParser(testList).run() 351 352 print 353 raw_input('hit enter') 359 clp = CommandLineParser(testList) 360 clp.run() 361 if clp.interactive: 362 print 363 raw_input('hit enter') 354 364 355 365
